Split out suite-ldap from suite-6

`multinode-kafka-ssl` was observed to be flaky on CI, however, it was not observed to be flaky in isolation (i.e. with all non-kafka images removed from suite-6). The commit redeuces number of different containers started by a GHA job.
trinodb · Oct 16, 2021 · 55b5b9d · 55b5b9d
1 parent 6c4b5ef
commit 55b5b9d
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -443,6 +443,10 @@ jobs:
             suite: suite-oauth2
             jdk: 11
           # this suite is not meant to be run with different configs
+          - config: default
+            suite: suite-ldap
+            jdk: 11
+          # this suite is not meant to be run with different configs
           - config: default
             suite: suite-compatibility
             jdk: 11

diff --git a/...launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite6NonGeneric.java b/...launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite6NonGeneric.java
@@ -21,11 +21,6 @@
 import io.trino.tests.product.launcher.env.environment.EnvSinglenodeCassandra;
 import io.trino.tests.product.launcher.env.environment.EnvSinglenodeKerberosKmsHdfsImpersonation;
 import io.trino.tests.product.launcher.env.environment.EnvSinglenodeKerberosKmsHdfsNoImpersonation;
-import io.trino.tests.product.launcher.env.environment.EnvSinglenodeLdap;
-import io.trino.tests.product.launcher.env.environment.EnvSinglenodeLdapAndFile;
-import io.trino.tests.product.launcher.env.environment.EnvSinglenodeLdapBindDn;
-import io.trino.tests.product.launcher.env.environment.EnvSinglenodeLdapInsecure;
-import io.trino.tests.product.launcher.env.environment.EnvSinglenodeLdapReferrals;
 import io.trino.tests.product.launcher.suite.Suite;
 import io.trino.tests.product.launcher.suite.SuiteTestRun;
 
@@ -43,11 +38,6 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
         verify(config.getHadoopBaseImage().equals(EnvironmentDefaults.HADOOP_BASE_IMAGE), "The suite should be run with default HADOOP_BASE_IMAGE. Leave HADOOP_BASE_IMAGE unset.");
 
         return ImmutableList.of(
-                testOnEnvironment(EnvSinglenodeLdap.class).withGroups("ldap").build(),
-                testOnEnvironment(EnvSinglenodeLdapAndFile.class).withGroups("ldap", "ldap_and_file", "ldap_cli", "ldap_and_file_cli").build(),
-                testOnEnvironment(EnvSinglenodeLdapInsecure.class).withGroups("ldap").build(),
-                testOnEnvironment(EnvSinglenodeLdapReferrals.class).withGroups("ldap").build(),
-                testOnEnvironment(EnvSinglenodeLdapBindDn.class).withGroups("ldap").withExcludedGroups("ldap_multiple_binds").build(),
                 testOnEnvironment(EnvSinglenodeKerberosKmsHdfsNoImpersonation.class).withGroups("storage_formats").build(),
                 testOnEnvironment(EnvSinglenodeKerberosKmsHdfsImpersonation.class).withGroups("storage_formats").build(),
                 testOnEnvironment(EnvSinglenodeCassandra.class).withGroups("cassandra").build(),

diff --git a/...-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteLdap.java b/...-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteLdap.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.tests.product.launcher.suite.suites;
+
+import com.google.common.collect.ImmutableList;
+import io.trino.tests.product.launcher.env.EnvironmentConfig;
+import io.trino.tests.product.launcher.env.EnvironmentDefaults;
+import io.trino.tests.product.launcher.env.environment.EnvSinglenodeLdap;
+import io.trino.tests.product.launcher.env.environment.EnvSinglenodeLdapAndFile;
+import io.trino.tests.product.launcher.env.environment.EnvSinglenodeLdapBindDn;
+import io.trino.tests.product.launcher.env.environment.EnvSinglenodeLdapInsecure;
+import io.trino.tests.product.launcher.env.environment.EnvSinglenodeLdapReferrals;
+import io.trino.tests.product.launcher.suite.Suite;
+import io.trino.tests.product.launcher.suite.SuiteTestRun;
+
+import java.util.List;
+
+import static com.google.common.base.Verify.verify;
+import static io.trino.tests.product.launcher.suite.SuiteTestRun.testOnEnvironment;
+
+public class SuiteLdap
+        extends Suite
+{
+    @Override
+    public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
+    {
+        verify(config.getHadoopBaseImage().equals(EnvironmentDefaults.HADOOP_BASE_IMAGE), "The suite should be run with default HADOOP_BASE_IMAGE. Leave HADOOP_BASE_IMAGE unset.");
+
+        return ImmutableList.of(
+                testOnEnvironment(EnvSinglenodeLdap.class).withGroups("ldap").build(),
+                testOnEnvironment(EnvSinglenodeLdapAndFile.class).withGroups("ldap", "ldap_and_file", "ldap_cli", "ldap_and_file_cli").build(),
+                testOnEnvironment(EnvSinglenodeLdapInsecure.class).withGroups("ldap").build(),
+                testOnEnvironment(EnvSinglenodeLdapReferrals.class).withGroups("ldap").build(),
+                testOnEnvironment(EnvSinglenodeLdapBindDn.class).withGroups("ldap").withExcludedGroups("ldap_multiple_binds").build());
+    }
+}