fix: Fixed presubmit configs and pytest errors (googleapis#1004). Wil…

…l revert this after testing.
abcdefgs0324 · Feb 20, 2022 · e9cd19d · e9cd19d
1 parent 7ba79e5
commit e9cd19d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg
@@ -25,3 +25,7 @@ env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
     value: "github/python-aiplatform/.kokoro/build.sh"
 }
+env_vars: {
+    key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
+    value: "ucaip-sample-tests"
+}
diff --git a/tests/system/aiplatform/e2e_base.py b/tests/system/aiplatform/e2e_base.py
@@ -91,7 +91,7 @@ def delete_staging_bucket(self, shared_state: Dict[str, Any]):
         bucket.delete(force=True)
 
     @pytest.fixture(scope="class", autouse=True)
-    def teardown(self, shared_state: Dict[str, Any]):
+    def tear_down_resources(self, shared_state: Dict[str, Any]):
         """Delete every Vertex AI resource created during test"""
 
         yield

diff --git a/tests/system/aiplatform/test_e2e_tabular.py b/tests/system/aiplatform/test_e2e_tabular.py
@@ -46,7 +46,7 @@
 }
 
 
-@pytest.mark.usefixtures("prepare_staging_bucket", "delete_staging_bucket", "teardown")
+@pytest.mark.usefixtures("prepare_staging_bucket", "delete_staging_bucket")
 class TestEndToEndTabular(e2e_base.TestEndToEnd):
     """End to end system test of the Vertex SDK with tabular data adapted from
     reference notebook http://shortn/_eyoNx3SN0X"""

diff --git a/tests/system/aiplatform/test_model_upload.py b/tests/system/aiplatform/test_model_upload.py
@@ -32,7 +32,7 @@
 _XGBOOST_MODEL_URI = "gs://cloud-samples-data-us-central1/vertex-ai/google-cloud-aiplatform-ci-artifacts/models/iris_xgboost/model.bst"
 
 
-@pytest.mark.usefixtures("delete_staging_bucket", "teardown")
+@pytest.mark.usefixtures("delete_staging_bucket")
 class TestModel(e2e_base.TestEndToEnd):
     _temp_prefix = f"{_TEST_PROJECT}-vertex-staging-{_TEST_LOCATION}"