Extract some product tests into a separate suites

.github/workflows/ci.yml

@@ -756,6 +756,10 @@ jobs:
             - suite-delta-lake-databricks104
             - suite-delta-lake-databricks113
             - suite-gcs
+            - suite-clients
+            - suite-functions
+            - suite-tpch
+            - suite-storage-formats-detailed
           exclude:
             - config: default
               ignore exclusion if: >-
@@ -845,6 +849,21 @@ jobs:
             # this suite is not meant to be run with different configs
             - config: default
               suite: suite-delta-lake-oss
+            # this suite is not meant to be run with different configs
+            - config: default
+              suite: suite-kafka
+            # this suite is not meant to be run with different configs
+            - config: default
+              suite: suite-cassandra
+            # this suite is not meant to be run with different configs
+            - config: default
+              suite: suite-clickhouse
+            # this suite is not meant to be run with different configs
+            - config: default
+              suite: suite-mysql
+            # this suite is not meant to be run with different configs
+            - config: default
+              suite: suite-iceberg
           EOF
       - name: Build PT matrix (all)
         if: |

testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite1.java

@@ -31,7 +31,19 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
     {
         return ImmutableList.of(
                 testOnEnvironment(EnvMultinode.class)
-                        .withExcludedGroups("large_query", "storage_formats", "storage_formats_detailed", "profile_specific_tests", "tpcds", "hive_compression", "azure")
+                        .withExcludedGroups(
+                                "azure",
+                                "cli",
+                                "jdbc",
+                                "trino_jdbc",
+                                "functions",
+                                "hive_compression",
+                                "large_query",
+                                "profile_specific_tests",
+                                "storage_formats",
+                                "storage_formats_detailed",
+                                "tpch",
+                                "tpcds")
                         .build());
     }
 }

testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite2.java

@@ -35,7 +35,7 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
     {
         return ImmutableList.of(
                 testOnEnvironment(EnvSinglenode.class)
-                        .withGroups("configured_features", "hdfs_no_impersonation", "storage_formats_detailed", "hive_compression", "hive_with_external_writes")
+                        .withGroups("configured_features", "hdfs_no_impersonation")
                         .build(),
                 testOnEnvironment(EnvSinglenodeKerberosHdfsNoImpersonation.class)
                         .withGroups("configured_features", "storage_formats", "hdfs_no_impersonation")

testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite6NonGeneric.java

@@ -16,11 +16,7 @@
 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.EnvMultinodeKafka;
-import io.trino.tests.product.launcher.env.environment.EnvMultinodeKafkaSaslPlaintext;
-import io.trino.tests.product.launcher.env.environment.EnvMultinodeKafkaSsl;
 import io.trino.tests.product.launcher.env.environment.EnvMultinodePhoenix5;
-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.EnvSinglenodeKerberosKmsHdfsImpersonationWithCredentialCache;
 import io.trino.tests.product.launcher.env.environment.EnvSinglenodeKerberosKmsHdfsNoImpersonation;
@@ -54,18 +50,6 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
                 testOnEnvironment(EnvSinglenodeKerberosKmsHdfsImpersonationWithCredentialCache.class)
                         .withGroups("configured_features", "storage_formats")
                         .build(),
-                testOnEnvironment(EnvSinglenodeCassandra.class)
-                        .withGroups("configured_features", "cassandra")
-                        .build(),
-                testOnEnvironment(EnvMultinodeKafka.class)
-                        .withGroups("configured_features", "kafka")
-                        .build(),
-                testOnEnvironment(EnvMultinodeKafkaSsl.class)
-                        .withGroups("configured_features", "kafka")
-                        .build(),
-                testOnEnvironment(EnvMultinodeKafkaSaslPlaintext.class)
-                        .withGroups("configured_features", "kafka")
-                        .build(),
                 testOnEnvironment(EnvMultinodePhoenix5.class)
                         .withGroups("configured_features", "phoenix")
                         .build());

testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/Suite7NonGeneric.java

@@ -16,15 +16,10 @@
 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.EnvMultinodeClickhouse;
 import io.trino.tests.product.launcher.env.environment.EnvMultinodeKerberosKudu;
-import io.trino.tests.product.launcher.env.environment.EnvMultinodeMariadb;
-import io.trino.tests.product.launcher.env.environment.EnvSinglenodeHiveIcebergRedirections;
 import io.trino.tests.product.launcher.env.environment.EnvSinglenodeKerberosHdfsImpersonationCrossRealm;
-import io.trino.tests.product.launcher.env.environment.EnvSinglenodeMysql;
 import io.trino.tests.product.launcher.env.environment.EnvSinglenodePostgresql;
 import io.trino.tests.product.launcher.env.environment.EnvSinglenodeSparkHive;
-import io.trino.tests.product.launcher.env.environment.EnvSinglenodeSparkIceberg;
 import io.trino.tests.product.launcher.env.environment.EnvSinglenodeSqlserver;
 import io.trino.tests.product.launcher.env.environment.EnvTwoKerberosHives;
 import io.trino.tests.product.launcher.env.environment.EnvTwoMixedHives;
@@ -45,31 +40,15 @@ 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(EnvSinglenodeMysql.class)
-                        .withGroups("configured_features", "mysql")
-                        .build(),
-                testOnEnvironment(EnvMultinodeMariadb.class)
-                        .withGroups("configured_features", "mariadb")
-                        .build(),
                 testOnEnvironment(EnvSinglenodePostgresql.class)
                         .withGroups("configured_features", "postgresql")
                         .build(),
                 testOnEnvironment(EnvSinglenodeSqlserver.class)
                         .withGroups("configured_features", "sqlserver")
                         .build(),
-                testOnEnvironment(EnvMultinodeClickhouse.class)
-                        .withGroups("configured_features", "clickhouse")
-                        .build(),
                 testOnEnvironment(EnvSinglenodeSparkHive.class)
                         .withGroups("configured_features", "hive_spark")
                         .build(),
-                testOnEnvironment(EnvSinglenodeSparkIceberg.class)
-                        .withGroups("configured_features", "iceberg")
-                        .withExcludedGroups("storage_formats")
-                        .build(),
-                testOnEnvironment(EnvSinglenodeHiveIcebergRedirections.class)
-                        .withGroups("configured_features", "hive_iceberg_redirections")
-                        .build(),
                 testOnEnvironment(EnvSinglenodeKerberosHdfsImpersonationCrossRealm.class)
                         .withGroups("configured_features", "storage_formats", "cli", "hdfs_impersonation")
                         .build(),

testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteCassandra.java

@@ -0,0 +1,37 @@
+/*
+ * 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.environment.EnvSinglenodeCassandra;
+import io.trino.tests.product.launcher.suite.Suite;
+import io.trino.tests.product.launcher.suite.SuiteTestRun;
+
+import java.util.List;
+
+import static io.trino.tests.product.launcher.suite.SuiteTestRun.testOnEnvironment;
+
+public class SuiteCassandra
+        extends Suite
+{
+    @Override
+    public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
+    {
+        return ImmutableList.of(
+                testOnEnvironment(EnvSinglenodeCassandra.class)
+                        .withGroups("configured_features", "cassandra")
+                        .build());
+    }
+}

testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteClickhouse.java

@@ -0,0 +1,37 @@
+/*
+ * 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.environment.EnvMultinodeClickhouse;
+import io.trino.tests.product.launcher.suite.Suite;
+import io.trino.tests.product.launcher.suite.SuiteTestRun;
+
+import java.util.List;
+
+import static io.trino.tests.product.launcher.suite.SuiteTestRun.testOnEnvironment;
+
+public class SuiteClickhouse
+        extends Suite
+{
+    @Override
+    public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
+    {
+        return ImmutableList.of(
+                testOnEnvironment(EnvMultinodeClickhouse.class)
+                        .withGroups("configured_features", "clickhouse")
+                        .build());
+    }
+}

testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteClients.java

@@ -0,0 +1,42 @@
+/*
+ * 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.environment.EnvMultinode;
+import io.trino.tests.product.launcher.suite.Suite;
+import io.trino.tests.product.launcher.suite.SuiteTestRun;
+
+import java.util.List;
+
+import static io.trino.tests.product.launcher.suite.SuiteTestRun.testOnEnvironment;
+
+public class SuiteClients
+        extends Suite
+{
+    @Override
+    public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
+    {
+        return ImmutableList.of(
+                testOnEnvironment(EnvMultinode.class)
+                        .withGroups(
+                                "configured-features",
+                                "cli",
+                                "jdbc",
+                                "trino_jdbc")
+                        .withExcludedGroups("profile_specific_tests")
+                        .build());
+    }
+}

testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteFunctions.java

@@ -0,0 +1,37 @@
+/*
+ * 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.environment.EnvMultinode;
+import io.trino.tests.product.launcher.suite.Suite;
+import io.trino.tests.product.launcher.suite.SuiteTestRun;
+
+import java.util.List;
+
+import static io.trino.tests.product.launcher.suite.SuiteTestRun.testOnEnvironment;
+
+public class SuiteFunctions
+        extends Suite
+{
+    @Override
+    public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
+    {
+        return ImmutableList.of(
+                testOnEnvironment(EnvMultinode.class)
+                        .withGroups("configured-features", "functions")
+                        .build());
+    }
+}

testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteIceberg.java

@@ -0,0 +1,46 @@
+/*
+ * 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.EnvSinglenodeHiveIcebergRedirections;
+import io.trino.tests.product.launcher.env.environment.EnvSinglenodeSparkIceberg;
+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 SuiteIceberg
+        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(EnvSinglenodeSparkIceberg.class)
+                        .withGroups("configured_features", "iceberg")
+                        .withExcludedGroups("storage_formats")
+                        .build(),
+                testOnEnvironment(EnvSinglenodeHiveIcebergRedirections.class)
+                        .withGroups("configured_features", "hive_iceberg_redirections")
+                        .build());
+    }
+}

testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteKafka.java

@@ -0,0 +1,45 @@
+/*
+ * 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.environment.EnvMultinodeKafka;
+import io.trino.tests.product.launcher.env.environment.EnvMultinodeKafkaSaslPlaintext;
+import io.trino.tests.product.launcher.env.environment.EnvMultinodeKafkaSsl;
+import io.trino.tests.product.launcher.suite.Suite;
+import io.trino.tests.product.launcher.suite.SuiteTestRun;
+
+import java.util.List;
+
+import static io.trino.tests.product.launcher.suite.SuiteTestRun.testOnEnvironment;
+
+public class SuiteKafka
+        extends Suite
+{
+    @Override
+    public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
+    {
+        return ImmutableList.of(
+                testOnEnvironment(EnvMultinodeKafka.class)
+                        .withGroups("configured_features", "kafka")
+                        .build(),
+                testOnEnvironment(EnvMultinodeKafkaSsl.class)
+                        .withGroups("configured_features", "kafka")
+                        .build(),
+                testOnEnvironment(EnvMultinodeKafkaSaslPlaintext.class)
+                        .withGroups("configured_features", "kafka")
+                        .build());
+    }
+}