diff --git a/tests/system/aiplatform/e2e_base.py b/tests/system/aiplatform/e2e_base.py index cb8e44152b..2b1aefefa9 100644 --- a/tests/system/aiplatform/e2e_base.py +++ b/tests/system/aiplatform/e2e_base.py @@ -116,7 +116,8 @@ def delete_staging_bucket(self, shared_state: Dict[str, Any]): # Get the staging bucket used for testing and wipe it bucket = shared_state["bucket"] - bucket.delete(force=True) + bucket.delete_blobs(bucket.list_blobs()) + bucket.delete() @pytest.fixture(scope="class") def prepare_bigquery_dataset( diff --git a/tests/system/aiplatform/test_dataset.py b/tests/system/aiplatform/test_dataset.py index e9488dcaa0..b902d54766 100644 --- a/tests/system/aiplatform/test_dataset.py +++ b/tests/system/aiplatform/test_dataset.py @@ -19,6 +19,7 @@ import uuid import pytest import importlib +import logging import pandas as pd import re @@ -162,7 +163,12 @@ def staging_bucket(self, storage_client): yield bucket - bucket.delete(force=True) + try: + blobs = list(bucket.list_blobs()) + bucket.delete_blobs(blobs) + bucket.delete() + except Exception as e: + logging.exception(f"Failed to cleanup bucket {new_staging_bucket}: {e}") @pytest.fixture() def dataset_gapic_client(self): diff --git a/tests/system/aiplatform/test_model_evaluation.py b/tests/system/aiplatform/test_model_evaluation.py index 30ae288524..828215742d 100644 --- a/tests/system/aiplatform/test_model_evaluation.py +++ b/tests/system/aiplatform/test_model_evaluation.py @@ -82,6 +82,13 @@ def staging_bucket(self, storage_client): yield bucket + try: + blobs = list(bucket.list_blobs()) + bucket.delete_blobs(blobs) + bucket.delete() + except Exception as e: + _LOGGER.info(f"Failed to delete bucket {new_staging_bucket}: {e}") + def test_model_evaluate_custom_tabular_model(self, staging_bucket, shared_state): credentials, _ = auth.default( scopes=["https://www.googleapis.com/auth/cloud-platform"] diff --git a/tests/system/aiplatform/test_model_monitoring.py b/tests/system/aiplatform/test_model_monitoring.py index c4c04ae3c8..3edc14543a 100644 --- a/tests/system/aiplatform/test_model_monitoring.py +++ b/tests/system/aiplatform/test_model_monitoring.py @@ -165,6 +165,7 @@ def test_mdm_two_models_one_valid_config(self, shared_state): location=e2e_base._LOCATION, endpoint=self.endpoint, ) + shared_state["resources"].append(job) gapic_job = job._gca_resource assert (