test: skip tests

Author: sophia-bq

.github/workflows/integration_tests.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [ "3.8", "3.11" ]
-        engine-version: [ "lts", "latest"]
+        engine-version: ["latest"]
         environment: ["mysql", "pg"]
 
     steps:

tests/integration/container/test_aurora_failover.py

@@ -44,6 +44,8 @@
 @enable_on_deployments([DatabaseEngineDeployment.AURORA, DatabaseEngineDeployment.RDS_MULTI_AZ_CLUSTER])
 @disable_on_features([TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY,
                       TestEnvironmentFeatures.BLUE_GREEN_DEPLOYMENT,
+                      TestEnvironmentFeatures.SKIP_MYSQL_DRIVER_TESTS,
+                      TestEnvironmentFeatures.SKIP_PG_DRIVER_TESTS,
                       TestEnvironmentFeatures.PERFORMANCE])
 class TestAuroraFailover:
     IDLE_CONNECTIONS_NUM: int = 5

tests/integration/container/test_basic_connectivity.py

@@ -38,6 +38,8 @@
 
 @disable_on_features([TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY,
                       TestEnvironmentFeatures.BLUE_GREEN_DEPLOYMENT,
+                      TestEnvironmentFeatures.SKIP_MYSQL_DRIVER_TESTS,
+                      TestEnvironmentFeatures.SKIP_PG_DRIVER_TESTS,
                       TestEnvironmentFeatures.PERFORMANCE])
 class TestBasicConnectivity:
 

tests/integration/container/test_basic_functionality.py

@@ -48,6 +48,8 @@
 
 @disable_on_features([TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY,
                       TestEnvironmentFeatures.BLUE_GREEN_DEPLOYMENT,
+                      TestEnvironmentFeatures.SKIP_MYSQL_DRIVER_TESTS,
+                      TestEnvironmentFeatures.SKIP_PG_DRIVER_TESTS,
                       TestEnvironmentFeatures.PERFORMANCE])
 class TestBasicFunctionality:
 

tests/integration/container/test_custom_endpoint.py

@@ -47,6 +47,8 @@
 @enable_on_deployments([DatabaseEngineDeployment.AURORA])
 @disable_on_features([TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY,
                       TestEnvironmentFeatures.BLUE_GREEN_DEPLOYMENT,
+                      TestEnvironmentFeatures.SKIP_MYSQL_DRIVER_TESTS,
+                      TestEnvironmentFeatures.SKIP_PG_DRIVER_TESTS,
                       TestEnvironmentFeatures.PERFORMANCE])
 class TestCustomEndpoint:
     logger: ClassVar[Logger] = Logger(__name__)

tests/integration/container/test_host_monitoring_v2.py

@@ -43,6 +43,8 @@
                         DatabaseEngineDeployment.RDS_MULTI_AZ_INSTANCE])
 @disable_on_features([TestEnvironmentFeatures.PERFORMANCE,
                       TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY,
+                      TestEnvironmentFeatures.SKIP_MYSQL_DRIVER_TESTS,
+                      TestEnvironmentFeatures.SKIP_PG_DRIVER_TESTS,
                       TestEnvironmentFeatures.BLUE_GREEN_DEPLOYMENT])
 class TestHostMonitoringV2:
     @pytest.fixture(scope='class')

tests/integration/container/test_iam_authentication.py

@@ -41,6 +41,8 @@
 @enable_on_features([TestEnvironmentFeatures.IAM])
 @disable_on_features([TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY,
                       TestEnvironmentFeatures.BLUE_GREEN_DEPLOYMENT,
+                      TestEnvironmentFeatures.SKIP_MYSQL_DRIVER_TESTS,
+                      TestEnvironmentFeatures.SKIP_PG_DRIVER_TESTS,
                       TestEnvironmentFeatures.PERFORMANCE])
 class TestAwsIamAuthentication:
 

tests/integration/host/src/test/java/integration/host/TestEnvironmentProvider.java

@@ -86,19 +86,7 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
             continue;
           }
 
-          for (int numOfInstances : Arrays.asList(1, 2, 3, 5)) {
-            if (instances == DatabaseInstances.SINGLE_INSTANCE && numOfInstances > 1) {
-              continue;
-            }
-            if (instances == DatabaseInstances.MULTI_INSTANCE && numOfInstances == 1) {
-              continue;
-            }
-            if (numOfInstances == 1 && config.excludeInstances1) {
-              continue;
-            }
-            if (numOfInstances == 2 && config.excludeInstances2) {
-              continue;
-            }
+          for (int numOfInstances : Arrays.asList(3,5)) {
             if (numOfInstances == 3 && config.excludeInstances3) {
               continue;
             }
@@ -109,7 +97,7 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
               // Multi-AZ clusters supports only 3 instances
               continue;
             }
-            if (deployment == DatabaseEngineDeployment.RDS_MULTI_AZ_INSTANCE && numOfInstances != 1) {
+            if (deployment == DatabaseEngineDeployment.RDS_MULTI_AZ_INSTANCE) {
               // Multi-AZ Instances supports only 1 instance
               continue;
             }