Skip to content

Commit

Permalink
Small fix of system tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Ulada Zakharava committed Dec 10, 2024
1 parent c1d44f5 commit 82eb5cd
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
DAG_ID = "dataproc_batch_ps"
PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID
BUCKET_NAME = f"bucket_{DAG_ID}_{ENV_ID}".replace("-", "_")
REGION = "europe-north1"
REGION = "us-east4"
CLUSTER_NAME_BASE = f"cluster-{DAG_ID}".replace("_", "-")
CLUSTER_NAME_FULL = CLUSTER_NAME_BASE + f"-{ENV_ID}".replace("_", "-")
CLUSTER_NAME = CLUSTER_NAME_BASE if len(CLUSTER_NAME_FULL) >= 33 else CLUSTER_NAME_FULL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
CLUSTER_NAME_BASE = f"{DAG_ID}".replace("_", "-")
CLUSTER_NAME_FULL = CLUSTER_NAME_BASE + f"-{ENV_ID}".replace("_", "-")
CLUSTER_NAME = CLUSTER_NAME_BASE if len(CLUSTER_NAME_FULL) >= 33 else CLUSTER_NAME_FULL
REGION = "europe-north1"
REGION = "us-east4"

# Cluster definition
CLUSTER_CONFIG = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
CLUSTER_NAME_BASE = f"cluster-{DAG_ID}".replace("_", "-")
CLUSTER_NAME_FULL = CLUSTER_NAME_BASE + f"-{ENV_ID}".replace("_", "-")
CLUSTER_NAME = CLUSTER_NAME_BASE if len(CLUSTER_NAME_FULL) >= 33 else CLUSTER_NAME_FULL
REGION = "europe-north1"
REGION = "us-east4"


# Cluster definition
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
environment={
"tempLocation": f"gs://{BUCKET_NAME}/tmp",
},
location="us-central1",
location="us-east4",
append_job_name=False,
trigger_rule=TriggerRule.ALL_DONE,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
VIDEO_DATA_CONFIG = [
{
"import_schema_uri": schema.dataset.ioformat.video.classification,
"gcs_source": {"uris": [f"gs://{RESOURCE_DATA_BUCKET}/vertex-ai/datasets/video-dataset.csv"]},
"gcs_source": {"uris": [f"gs://{RESOURCE_DATA_BUCKET}/automl/datasets/video/classification.csv"]},
},
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,10 @@ def delete_connection(connection_id: str) -> None:

# This test needs watcher in order to properly mark success/failure
# when "tearDown" task with trigger rule is part of the DAG
list(dag.tasks) >> watcher()

# Excluding sensor because we expect it to fail due to cancelled operation
[task for task in dag.tasks
if task.task_id not in ["insert_conversion", "update_conversion", "delete_connection"]] >> watcher()

from tests_common.test_utils.system_tests import get_test_run # noqa: E402

Expand Down

0 comments on commit 82eb5cd

Please sign in to comment.