From d3e50e2760c6a98910efae08ebcf35d2dfdc0666 Mon Sep 17 00:00:00 2001 From: Pavan Kumar Date: Tue, 8 Oct 2024 01:06:01 +0100 Subject: [PATCH 1/2] quarantined flaky mssql integration tests --- .../providers/apache/hive/transfers/test_mssql_to_hive.py | 1 + .../providers/google/cloud/transfers/test_bigquery_to_mssql.py | 1 + .../providers/google/cloud/transfers/test_mssql_to_gcs.py | 1 + tests/integration/providers/microsoft/mssql/hooks/test_mssql.py | 1 + 4 files changed, 4 insertions(+) diff --git a/tests/integration/providers/apache/hive/transfers/test_mssql_to_hive.py b/tests/integration/providers/apache/hive/transfers/test_mssql_to_hive.py index ca62b264ba05a..8dd3d5d154653 100644 --- a/tests/integration/providers/apache/hive/transfers/test_mssql_to_hive.py +++ b/tests/integration/providers/apache/hive/transfers/test_mssql_to_hive.py @@ -29,6 +29,7 @@ TEST_TABLE_ID = "Persons" +@pytest.mark.quarantined @pytest.mark.integration("mssql") class TestMsSqlToHiveTransfer: def setup_method(self, mocker): diff --git a/tests/integration/providers/google/cloud/transfers/test_bigquery_to_mssql.py b/tests/integration/providers/google/cloud/transfers/test_bigquery_to_mssql.py index 04271cca69ce6..e407d535d080c 100644 --- a/tests/integration/providers/google/cloud/transfers/test_bigquery_to_mssql.py +++ b/tests/integration/providers/google/cloud/transfers/test_bigquery_to_mssql.py @@ -36,6 +36,7 @@ ] +@pytest.mark.quarantined @pytest.mark.integration("mssql") class TestBigQueryToMsSqlOperator: def setup_method(self): diff --git a/tests/integration/providers/google/cloud/transfers/test_mssql_to_gcs.py b/tests/integration/providers/google/cloud/transfers/test_mssql_to_gcs.py index 919d5387a2afd..8e7a876768965 100644 --- a/tests/integration/providers/google/cloud/transfers/test_mssql_to_gcs.py +++ b/tests/integration/providers/google/cloud/transfers/test_mssql_to_gcs.py @@ -40,6 +40,7 @@ ] +@pytest.mark.quarantined @pytest.mark.integration("mssql") class TestMsSqlToGoogleCloudStorageOperator: def setup_method(self): diff --git a/tests/integration/providers/microsoft/mssql/hooks/test_mssql.py b/tests/integration/providers/microsoft/mssql/hooks/test_mssql.py index ec7c2759e5107..3cba9de7599ff 100644 --- a/tests/integration/providers/microsoft/mssql/hooks/test_mssql.py +++ b/tests/integration/providers/microsoft/mssql/hooks/test_mssql.py @@ -26,6 +26,7 @@ AIRFLOW_CONN_MSSQL_DEFAULT = "mssql://sa:airflow123@mssql:1433/" +@pytest.mark.quarantined @pytest.mark.integration("mssql") class TestMsSqlHook: def setup_method(self): From 6534aded9e70b6556882472e48c00473a544de57 Mon Sep 17 00:00:00 2001 From: Pavan Kumar Date: Wed, 9 Oct 2024 07:48:54 +0100 Subject: [PATCH 2/2] disable mssql from ci integration checks --- dev/breeze/src/airflow_breeze/global_constants.py | 3 +++ dev/breeze/src/airflow_breeze/utils/selective_checks.py | 7 ++++++- .../providers/apache/hive/transfers/test_mssql_to_hive.py | 1 - .../google/cloud/transfers/test_bigquery_to_mssql.py | 1 - .../providers/google/cloud/transfers/test_mssql_to_gcs.py | 1 - .../providers/microsoft/mssql/hooks/test_mssql.py | 1 - 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dev/breeze/src/airflow_breeze/global_constants.py b/dev/breeze/src/airflow_breeze/global_constants.py index 64bf8112112ab..98bb5f5a1c930 100644 --- a/dev/breeze/src/airflow_breeze/global_constants.py +++ b/dev/breeze/src/airflow_breeze/global_constants.py @@ -68,6 +68,9 @@ "trino", "ydb", ] +DISABLE_TESTABLE_INTEGRATIONS_FROM_CI = [ + "mssql", +] OTHER_INTEGRATIONS = ["statsd", "otel", "openlineage"] ALLOWED_DEBIAN_VERSIONS = ["bookworm"] ALL_INTEGRATIONS = sorted( diff --git a/dev/breeze/src/airflow_breeze/utils/selective_checks.py b/dev/breeze/src/airflow_breeze/utils/selective_checks.py index 385cd6f14411a..da08959c83507 100644 --- a/dev/breeze/src/airflow_breeze/utils/selective_checks.py +++ b/dev/breeze/src/airflow_breeze/utils/selective_checks.py @@ -42,6 +42,7 @@ DEFAULT_MYSQL_VERSION, DEFAULT_POSTGRES_VERSION, DEFAULT_PYTHON_MAJOR_MINOR_VERSION, + DISABLE_TESTABLE_INTEGRATIONS_FROM_CI, HELM_VERSION, KIND_VERSION, RUNS_ON_PUBLIC_RUNNER, @@ -1295,7 +1296,11 @@ def excluded_providers_as_string(self) -> str: @cached_property def testable_integrations(self) -> list[str]: - return TESTABLE_INTEGRATIONS + return [ + integration + for integration in TESTABLE_INTEGRATIONS + if integration not in DISABLE_TESTABLE_INTEGRATIONS_FROM_CI + ] @cached_property def is_committer_build(self): diff --git a/tests/integration/providers/apache/hive/transfers/test_mssql_to_hive.py b/tests/integration/providers/apache/hive/transfers/test_mssql_to_hive.py index 8dd3d5d154653..ca62b264ba05a 100644 --- a/tests/integration/providers/apache/hive/transfers/test_mssql_to_hive.py +++ b/tests/integration/providers/apache/hive/transfers/test_mssql_to_hive.py @@ -29,7 +29,6 @@ TEST_TABLE_ID = "Persons" -@pytest.mark.quarantined @pytest.mark.integration("mssql") class TestMsSqlToHiveTransfer: def setup_method(self, mocker): diff --git a/tests/integration/providers/google/cloud/transfers/test_bigquery_to_mssql.py b/tests/integration/providers/google/cloud/transfers/test_bigquery_to_mssql.py index e407d535d080c..04271cca69ce6 100644 --- a/tests/integration/providers/google/cloud/transfers/test_bigquery_to_mssql.py +++ b/tests/integration/providers/google/cloud/transfers/test_bigquery_to_mssql.py @@ -36,7 +36,6 @@ ] -@pytest.mark.quarantined @pytest.mark.integration("mssql") class TestBigQueryToMsSqlOperator: def setup_method(self): diff --git a/tests/integration/providers/google/cloud/transfers/test_mssql_to_gcs.py b/tests/integration/providers/google/cloud/transfers/test_mssql_to_gcs.py index 8e7a876768965..919d5387a2afd 100644 --- a/tests/integration/providers/google/cloud/transfers/test_mssql_to_gcs.py +++ b/tests/integration/providers/google/cloud/transfers/test_mssql_to_gcs.py @@ -40,7 +40,6 @@ ] -@pytest.mark.quarantined @pytest.mark.integration("mssql") class TestMsSqlToGoogleCloudStorageOperator: def setup_method(self): diff --git a/tests/integration/providers/microsoft/mssql/hooks/test_mssql.py b/tests/integration/providers/microsoft/mssql/hooks/test_mssql.py index 3cba9de7599ff..ec7c2759e5107 100644 --- a/tests/integration/providers/microsoft/mssql/hooks/test_mssql.py +++ b/tests/integration/providers/microsoft/mssql/hooks/test_mssql.py @@ -26,7 +26,6 @@ AIRFLOW_CONN_MSSQL_DEFAULT = "mssql://sa:airflow123@mssql:1433/" -@pytest.mark.quarantined @pytest.mark.integration("mssql") class TestMsSqlHook: def setup_method(self):