diff --git a/test/canary/scripts/run_test.sh b/test/canary/scripts/run_test.sh index 98f6f48d..0a5ddc2e 100755 --- a/test/canary/scripts/run_test.sh +++ b/test/canary/scripts/run_test.sh @@ -48,6 +48,8 @@ function cleanup { kubectl delete modelpackagegroups --all kubectl delete notebookinstances --all kubectl delete notebookinstancelifecycleconfig --all + kubectl delete pipelineexecutions --all + kubectl delete pipelines --all print_controller_logs @@ -85,5 +87,12 @@ pushd $E2E_DIR # run tests echo "Run Tests" - pytest -n 15 --dist loadfile --log-cli-level INFO -m canary + pytest_args=( -n 15 --dist loadfile --log-cli-level INFO ) + if [[ $SERVICE_REGION =~ ^(eu-north-1|eu-west-3)$ ]]; then + # If select_regions_1 true we run the notebook_instance test + pytest_args+=(-m "canary or select_regions_1") + else + pytest_args+=(-m "canary") + pytest "${pytest_args[@]}" + fi popd diff --git a/test/e2e/tests/test_notebook_instance.py b/test/e2e/tests/test_notebook_instance.py index a44a7c66..dd86e927 100644 --- a/test/e2e/tests/test_notebook_instance.py +++ b/test/e2e/tests/test_notebook_instance.py @@ -86,7 +86,7 @@ def get_notebook_instance_resource_status(reference: k8s.CustomResourceReference return resource["status"]["notebookInstanceStatus"] @flaky(max_runs=2, min_passes=1) -@pytest.mark.canary +@pytest.mark.select_regions_1 @service_marker class TestNotebookInstance: def _wait_resource_notebook_status(