From d67bd117f472686dbe9481bd7a5d08d8f64b47f2 Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Mon, 13 Jul 2020 12:54:43 +0300
Subject: [PATCH] Creates maven profiles for integration tests

Allows running groups of test in CI builds with commands like:

    mvn -e -pl integration-tests -amd -PIT-Security1 verify
    mvn -e -pl integration-tests -amd -Dnative -PIT-Security1 verify
    mvn -e -pl integration-tests -amd -Dno-format -DskipDocs -Dnative -PIT-Security1 verify

etc.
---
 .github/workflows/ci-actions.yml | 170 ++----------
 integration-tests/pom.xml        | 442 +++++++++++++++++++++----------
 2 files changed, 329 insertions(+), 283 deletions(-)

diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
index b3c173a30e622c..86d2f9fe72cd0c 100644
--- a/.github/workflows/ci-actions.yml
+++ b/.github/workflows/ci-actions.yml
@@ -399,187 +399,64 @@ jobs:
       max-parallel: 8
       fail-fast: false
       matrix:
-        category: [Main, Data1, Data2, Data3, Data4, Data5, Data6, Security1, Security2, Security3, Amazon, Messaging, Cache, HTTP, Misc1, Misc2, Misc3, Misc4, Spring, gRPC]
+        category: [IT-Main, IT-Data1, IT-Data2, IT-Data3, IT-Data4, IT-Data5, IT-Data6, IT-Security1, IT-Security2, IT-Security3, IT-Amazon, IT-Messaging, IT-Cache, IT-HTTP, IT-Misc1, IT-Misc2, IT-Misc3, IT-Misc4, IT-Spring, IT-gRPC]
         include:
-          - category: Main
+          - category: IT-Main
             postgres: "true"
             timeout: 40
-            test-modules: main
-          - category: Data1
+          - category: IT-Data1
             mariadb: "true"
             mssql: "true"
             timeout: 65
-            test-modules: >
-              jpa-h2
-              jpa-mariadb
-              jpa-mssql
-              jpa-derby
-              jpa-without-entity
-              hibernate-tenancy
-          - category: Data2
+          - category: IT-Data2
             db2: "true"
             mysql: "true"
             mariadb: "true"
             timeout: 65
-            test-modules: >
-              jpa
-              jpa-mysql
-              jpa-db2
-              reactive-mysql-client
-              reactive-db2-client
-              hibernate-reactive-db2
-              hibernate-reactive-mysql
-          - category: Data3
+          - category: IT-Data3
             postgres: "true"
             timeout: 70
-            test-modules: >
-              flyway
-              hibernate-orm-panache
-              hibernate-orm-panache-kotlin
-              hibernate-orm-envers
-              liquibase
-          - category: Data4
+          - category: IT-Data4
             neo4j: "true"
             redis: "true"
             timeout: 55
-            test-modules: >
-              mongodb-client
-              mongodb-panache
-              redis-client
-              neo4j
-              hibernate-orm-rest-data-panache
-          - category: Data5
+          - category: IT-Data5
             postgres: "true"
             timeout: 65
-            test-modules: >
-              jpa-postgresql
-              narayana-stm
-              narayana-jta
-              reactive-pg-client
-              hibernate-reactive-postgresql
           - category: Data6
             postgres: "true"
             elasticsearch: "true"
             timeout: 40
-            test-modules: >
-              elasticsearch-rest-client
-              elasticsearch-rest-high-level-client
-              hibernate-search-orm-elasticsearch
-          - category: Amazon
+          - category: IT-Amazon
             amazonServices: "true"
             timeout: 45
-            test-modules: >
-              amazon-services
-              amazon-lambda
-              amazon-lambda-http
-          - category: Messaging
+          - category: IT-Messaging
             timeout: 85
-            test-modules: >
-              artemis-core
-              artemis-jms
-              kafka
-              kafka-streams
-              reactive-messaging-amqp
-              reactive-messaging-kafka
-          - category: Security1
+          - category: IT-Security1
             timeout: 50
             keycloak: "true"
-            test-modules: >
-              elytron-security-oauth2
-              elytron-security
-              elytron-security-jdbc
-              elytron-undertow
-              elytron-security-ldap
-          - category: Security2
+          - category: IT-Security2
             timeout: 70
             keycloak: "true"
-            test-modules: >
-              oidc
-              oidc-code-flow
-              oidc-tenancy
-              keycloak-authorization
-              oidc-wiremock
-          - category: Security3
+          - category: IT-Security3
             timeout: 50
-            test-modules: >
-              vault
-              vault-app
-              vault-agroal
-          - category: Cache
+          - category: IT-Cache
             timeout: 55
-            test-modules: >
-              infinispan-cache-jpa
-              infinispan-client
-              cache
-          - category: HTTP
+          - category: IT-HTTP
             timeout: 60
-            test-modules: >
-              elytron-resteasy
-              resteasy-jackson
-              resteasy-mutiny
-              vertx
-              vertx-http
-              vertx-web
-              vertx-graphql
-              virtual-http
-              rest-client
-          - category: Misc1
+          - category: IT-Misc1
             timeout: 65
-            test-modules: >
-              maven
-              jackson
-              jsonb
-              jsch
-              jgit
-              quartz
-              qute
-              consul-config
-          - category: Misc2
+          - category: IT-Misc2
             timeout: 65
-            test-modules: >
-              tika
-              hibernate-validator
-              test-extension
-              logging-gelf
-              bootstrap-config
-              mailer
           # kubernetes-client alone takes 30mn+
-          - category: Misc3
+          - category: IT-Misc3
             timeout: 65
-            test-modules: >
-              kubernetes-client
-              openshift-client
-          - category: Misc4
+          - category: IT-Misc4
             timeout: 65
-            test-modules: >
-              smallrye-config
-              smallrye-graphql
-              picocli-native
-              gradle
-              micrometer-mp-metrics
-              micrometer-prometheus
-              smallrye-metrics
-              logging-json
-              jaxp
-          - category: Spring
+          - category: IT-Spring
             timeout: 50
-            test-modules: >
-              spring-di
-              spring-web
-              spring-data-jpa
-              spring-boot-properties
-              spring-cloud-config-client
-          - category: gRPC
+          - category: IT-gRPC
             timeout: 65
-            test-modules: >
-              grpc-health
-              grpc-interceptors
-              grpc-mutual-auth
-              grpc-plain-text
-              grpc-plain-text-mutiny
-              grpc-proto-v2
-              grpc-streaming
-              grpc-tls
     steps:
       # These should be services, but services do not (yet) allow conditional execution
       - name: Postgres Service
@@ -660,17 +537,14 @@ jobs:
         run: tar -xzf maven-repo.tgz -C ~
       - name: Build with Maven
         env:
-          TEST_MODULES: ${{matrix.test-modules}}
           CATEGORY: ${{matrix.category}}
         run: |
-          for i in $TEST_MODULES
-          do modules+=("integration-tests/$i"); done
           IFS=,
-          eval mvn -pl "${modules[*]}" $NATIVE_TEST_MAVEN_OPTS
+          eval mvn -pl integration-tests -amd -P$CATEGORY $NATIVE_TEST_MAVEN_OPTS
           # add the 'simple with spaces' project to the run of 'Misc1' by executing it explicitly
           # done because there is no good way to pass strings with empty values to the previous command
           # so this hack is as good as any
-          if [ "$CATEGORY" == "Misc1" ]; then
+          if [ "$CATEGORY" == "IT-Misc1" ]; then
             mvn -Dnative -Dquarkus.native.container-build=true -B --settings .github/mvn-settings.xml -f 'integration-tests/simple with space/' verify
           fi
       - name: Prepare failure archive (if maven failed)
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 342d5b780c3422..e4df605b00603c 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -22,142 +22,314 @@
         <native.surefire.skip>${skipTests}</native.surefire.skip>
     </properties>
 
-    <modules>
-        <module>funqy-amazon-lambda</module>
-        <module>funqy-google-cloud-functions</module>
-        <module>class-transformer</module>
-        <module>shared-library</module>
-        <module>hibernate-validator</module>
-        <module>common-jpa-entities</module>
-        <module>infinispan-client</module>
-        <module>devtools</module>
-        <module>gradle</module>
-        <module>main</module>
-        <module>kafka</module>
-        <module>kafka-avro</module>
-        <module>kafka-streams</module>
-        <module>jpa</module>
-        <module>jpa-db2</module>
-        <module>jpa-derby</module>
-        <module>jpa-postgresql</module>
-        <module>vault</module>
-        <module>vault-agroal</module>
-        <module>vault-app</module>
-        <module>jpa-mariadb</module>
-        <module>jpa-h2</module>
-        <module>jpa-mssql</module>
-        <module>jpa-mysql</module>
-        <module>hibernate-orm-panache</module>
-        <module>hibernate-orm-rest-data-panache</module>
-        <module>hibernate-orm-panache-kotlin</module>
-        <module>hibernate-reactive-db2</module>
-        <module>hibernate-reactive-mysql</module>
-        <module>hibernate-reactive-postgresql</module>
-        <module>hibernate-reactive-panache</module>
-        <module>hibernate-search-orm-elasticsearch</module>
-        <module>hibernate-tenancy</module>
-        <module>hibernate-orm-envers</module>
-        <module>vertx-http</module>
-        <module>vertx-web</module>
-        <module>vertx</module>
-        <module>spring-di</module>
-        <module>spring-web</module>
-        <module>spring-data-jpa</module>
-        <module>spring-boot-properties</module>
-        <module>spring-cloud-config-client</module>
-        <module>infinispan-cache-jpa</module>
-        <module>elytron-security</module>
-        <module>elytron-security-oauth2</module>
-        <module>elytron-resteasy</module>
-        <module>elytron-undertow</module>
-        <module>flyway</module>
-        <module>liquibase</module>
-        <module>oidc</module>
-        <module>oidc-code-flow</module>
-        <module>oidc-tenancy</module>
-        <module>oidc-wiremock</module>
-        <module>keycloak-authorization</module>
-        <module>reactive-db2-client</module>
-        <module>reactive-pg-client</module>
-        <module>reactive-mysql-client</module>
-        <module>amazon-services</module>
-        <module>test-extension</module>
-        <module>amazon-lambda</module>
-        <module>amazon-lambda-stream-handler</module>
-        <module>amazon-lambda-http</module>
-        <module>amazon-lambda-http-resteasy</module>
-        <module>container-image</module>
-        <module>kubernetes</module>
-        <module>kubernetes-client</module>
-        <module>openshift-client</module>
-        <module>tika</module>
-        <module>neo4j</module>
-        <module>mongodb-client</module>
-        <module>jackson</module>
-        <module>jsonb</module>
-        <module>resteasy-jackson</module>
-        <module>resteasy-mutiny</module>
-        <module>jgit</module>
-        <module>jsch</module>
-        <module>virtual-http</module>
-        <module>virtual-http-resteasy</module>
-        <module>artemis-core</module>
-        <module>artemis-jms</module>
-        <module>maven</module>
-        <module>scala</module>
-        <module>kotlin</module>
-        <module>mongodb-panache</module>
-        <module>mongodb-panache-kotlin</module>
-        <module>mongodb-rest-data-panache</module>
-        <module>narayana-stm</module>
-        <module>narayana-jta</module>
-        <module>elytron-security-jdbc</module>
-        <module>elytron-security-ldap</module>
-        <module>vertx-graphql</module>
-        <module>smallrye-config</module>
-        <module>smallrye-context-propagation</module>
-        <module>smallrye-metrics</module>
-        <module>smallrye-graphql</module>
-        <module>jpa-without-entity</module>
-        <module>quartz</module>
-        <module>redis-client</module>
-        <module>logging-gelf</module>
-        <module>cache</module>
-        <module>qute</module>
-        <module>bootstrap-config</module>
-        <module>injectmock</module>
-        <module>reactive-messaging-amqp</module>
-        <module>reactive-messaging-kafka</module>
-        <module>rest-client</module>
-        <module>packaging</module>
-        <module>simple with space</module>
-        <module>consul-config</module>
-        <module>picocli</module>
-        <module>picocli-native</module>
-        <module>webjars-locator</module>
-        <module>devmode</module>
-        <module>ide-launcher</module>
-        <module>elasticsearch-rest-client</module>
-        <module>elasticsearch-rest-high-level-client</module>
-        <module>micrometer-jmx</module>
-        <module>micrometer-mp-metrics</module>
-        <module>micrometer-prometheus</module>
-        <module>logging-json</module>
-        <module>jaxp</module>
-        <module>mailer</module>
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>funqy-amazon-lambda</module>
+                <module>funqy-google-cloud-functions</module>
+                <module>class-transformer</module>
+                <module>shared-library</module>
+                <module>common-jpa-entities</module>
+                <module>kafka-avro</module>
+                <module>test-extension</module>
+                <module>amazon-lambda-stream-handler</module>
+                <module>amazon-lambda-http-resteasy</module>
+                <module>container-image</module>
+                <module>kubernetes</module>
+                <module>virtual-http-resteasy</module>
+                <module>scala</module>
+                <module>kotlin</module>
+                <module>smallrye-context-propagation</module>
+                <module>injectmock</module>
+                <module>packaging</module>
+                <module>simple with space</module>
+                <module>picocli</module>
+                <module>webjars-locator</module>
+                <module>devmode</module>
+                <module>ide-launcher</module>
+                <module>devtools</module>
+                <module>hibernate-reactive-panache</module>
+                <module>mongodb-panache-kotlin</module>
+                <module>mongodb-rest-data-panache</module>
+                <module>micrometer-jmx</module>
 
-        <!-- gRPC tests -->
-        <module>grpc-tls</module>
-        <module>grpc-plain-text</module>
-        <module>grpc-plain-text-mutiny</module>
-        <module>grpc-mutual-auth</module>
-        <module>grpc-streaming</module>
-        <module>grpc-interceptors</module>
-        <module>grpc-proto-v2</module>
-        <module>grpc-health</module>
-        <module>google-cloud-functions-http</module>
-        <module>google-cloud-functions</module>
-    </modules>
+                <!-- gRPC tests -->
+                <module>google-cloud-functions-http</module>
+                <module>google-cloud-functions</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Main</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>main</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Data1</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>jpa-h2</module>
+                <module>jpa-mariadb</module>
+                <module>jpa-mssql</module>
+                <module>jpa-derby</module>
+                <module>jpa-without-entity</module>
+                <module>hibernate-tenancy</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Data2</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>jpa</module>
+                <module>jpa-mysql</module>
+                <module>jpa-db2</module>
+                <module>reactive-mysql-client</module>
+                <module>reactive-db2-client</module>
+                <module>hibernate-reactive-db2</module>
+                <module>hibernate-reactive-mysql</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Data3</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>flyway</module>
+                <module>hibernate-orm-panache</module>
+                <module>hibernate-orm-panache-kotlin</module>
+                <module>hibernate-orm-envers</module>
+                <module>liquibase</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Data4</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>mongodb-client</module>
+                <module>mongodb-panache</module>
+                <module>redis-client</module>
+                <module>neo4j</module>
+                <module>hibernate-orm-rest-data-panache</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Data5</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>jpa-postgresql</module>
+                <module>narayana-stm</module>
+                <module>narayana-jta</module>
+                <module>reactive-pg-client</module>
+                <module>hibernate-reactive-postgresql</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Data6</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>elasticsearch-rest-client</module>
+                <module>elasticsearch-rest-high-level-client</module>
+                <module>hibernate-search-orm-elasticsearch</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Amazon</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>amazon-services</module>
+                <module>amazon-lambda</module>
+                <module>amazon-lambda-http</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Messaging</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>artemis-core</module>
+                <module>artemis-jms</module>
+                <module>kafka</module>
+                <module>kafka-streams</module>
+                <module>reactive-messaging-amqp</module>
+                <module>reactive-messaging-kafka</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Security1</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>elytron-security-oauth2</module>
+                <module>elytron-security</module>
+                <module>elytron-security-jdbc</module>
+                <module>elytron-undertow</module>
+                <module>elytron-security-ldap</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Security2</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>oidc</module>
+                <module>oidc-code-flow</module>
+                <module>oidc-tenancy</module>
+                <module>keycloak-authorization</module>
+                <module>oidc-wiremock</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Security3</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>vault</module>
+                <module>vault-app</module>
+                <module>vault-agroal</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Cache</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>infinispan-cache-jpa</module>
+                <module>infinispan-client</module>
+                <module>cache</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-HTTP</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>elytron-resteasy</module>
+                <module>resteasy-jackson</module>
+                <module>resteasy-mutiny</module>
+                <module>vertx</module>
+                <module>vertx-http</module>
+                <module>vertx-web</module>
+                <module>vertx-graphql</module>
+                <module>virtual-http</module>
+                <module>rest-client</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Misc1</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>maven</module>
+                <module>jackson</module>
+                <module>jsonb</module>
+                <module>jsch</module>
+                <module>jgit</module>
+                <module>quartz</module>
+                <module>qute</module>
+                <module>consul-config</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Misc2</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>tika</module>
+                <module>hibernate-validator</module>
+                <module>test-extension</module>
+                <module>logging-gelf</module>
+                <module>bootstrap-config</module>
+                <module>mailer</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Misc3</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>kubernetes-client</module>
+                <module>openshift-client</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Misc4</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <it-subset>true</it-subset>
+            </properties>
+            <modules>
+                <module>smallrye-config</module>
+                <module>smallrye-graphql</module>
+                <module>picocli-native</module>
+                <module>gradle</module>
+                <module>micrometer-mp-metrics</module>
+                <module>micrometer-prometheus</module>
+                <module>smallrye-metrics</module>
+                <module>logging-json</module>
+                <module>jaxp</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-Spring</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>spring-di</module>
+                <module>spring-web</module>
+                <module>spring-data-jpa</module>
+                <module>spring-boot-properties</module>
+                <module>spring-cloud-config-client</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>IT-gRPC</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>grpc-health</module>
+                <module>grpc-interceptors</module>
+                <module>grpc-mutual-auth</module>
+                <module>grpc-plain-text</module>
+                <module>grpc-plain-text-mutiny</module>
+                <module>grpc-proto-v2</module>
+                <module>grpc-streaming</module>
+                <module>grpc-tls</module>
+            </modules>
+        </profile>
+    </profiles>
 
     <build>
         <plugins>