[WFLY-19102] Enable WebClusteringTestCaseIT for EAP

wildfly-extras · Sep 26, 2024 · 969532e · 969532e
1 parent 0ee9d81
commit 969532e
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 19 deletions.
diff --git a/images/cloud-server/pom.xml b/images/cloud-server/pom.xml
@@ -34,8 +34,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
+                <groupId>${server.maven.plugin.groupId}</groupId>
+                <artifactId>${server.maven.plugin.artifactId}</artifactId>
+                <version>${server.maven.plugin.version}</version>
                 <configuration>
                     <layers>
                         <layer>cloud-server</layer>

diff --git a/images/datasources/postgresql/pom.xml b/images/datasources/postgresql/pom.xml
@@ -35,8 +35,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
+                <groupId>${server.maven.plugin.groupId}</groupId>
+                <artifactId>${server.maven.plugin.artifactId}</artifactId>
+                <version>${server.maven.plugin.version}</version>
                 <configuration>
                     <feature-packs>
                         <feature-pack>

diff --git a/images/elytron-oidc-client/pom.xml b/images/elytron-oidc-client/pom.xml
@@ -34,8 +34,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
+                <groupId>${server.maven.plugin.groupId}</groupId>
+                <artifactId>${server.maven.plugin.artifactId}</artifactId>
+                <version>${server.maven.plugin.version}</version>
                 <configuration>
                     <layers>
                         <layer>cloud-server</layer>

diff --git a/images/micrometer/pom.xml b/images/micrometer/pom.xml
@@ -34,8 +34,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
+                <groupId>${server.maven.plugin.groupId}</groupId>
+                <artifactId>${server.maven.plugin.artifactId}</artifactId>
+                <version>${server.maven.plugin.version}</version>
                 <configuration>
                     <layers>
                         <layer>cloud-server</layer>

diff --git a/images/microprofile-reactive-messaging-kafka/pom.xml b/images/microprofile-reactive-messaging-kafka/pom.xml
@@ -34,8 +34,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
+                <groupId>${server.maven.plugin.groupId}</groupId>
+                <artifactId>${server.maven.plugin.artifactId}</artifactId>
+                <version>${server.maven.plugin.version}</version>
                 <configuration>
                     <layers>
                         <layer>cloud-server</layer>

diff --git a/images/opentelemetry/pom.xml b/images/opentelemetry/pom.xml
@@ -34,8 +34,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
+                <groupId>${server.maven.plugin.groupId}</groupId>
+                <artifactId>${server.maven.plugin.artifactId}</artifactId>
+                <version>${server.maven.plugin.version}</version>
                 <configuration>
                     <layers>
                         <layer>cloud-server</layer>

diff --git a/images/pom.xml b/images/pom.xml
@@ -34,6 +34,11 @@
     <properties>
         <!-- Here to avoid provisioning server and building images for this parent module -->
         <wildfly.cloud.test.skip.image>true</wildfly.cloud.test.skip.image>
+        <server.maven.plugin.groupId>org.wildfly.plugins</server.maven.plugin.groupId>
+        <server.maven.plugin.artifactId>wildfly-maven-plugin</server.maven.plugin.artifactId>
+        <server.maven.plugin.version>${version.org.wildfly.plugins.wildfly-maven-plugin}</server.maven.plugin.version>
+        <server.feature.pack.gav>org.wildfly:wildfly-galleon-pack:${version.wildfly}</server.feature.pack.gav>
+        <cloud.feature.pack.gav>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly.cloud.galleon.pack}</cloud.feature.pack.gav>
     </properties>
 
     <profiles>
@@ -76,17 +81,18 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.wildfly.plugins</groupId>
-                        <artifactId>wildfly-maven-plugin</artifactId>
+                        <groupId>${server.maven.plugin.groupId}</groupId>
+                        <artifactId>${server.maven.plugin.artifactId}</artifactId>
+                        <version>${server.maven.plugin.version}</version>
                         <configuration>
                             <!-- some tests check for the provisioned galleon layers -->
                             <record-provisioning-state>true</record-provisioning-state>
                             <feature-packs>
                                 <feature-pack>
-                                    <location>org.wildfly:wildfly-galleon-pack:${version.wildfly}</location>
+                                    <location>${server.feature.pack.gav}</location>
                                 </feature-pack>
                                 <feature-pack>
-                                    <location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly.cloud.galleon.pack}</location>
+                                    <location>${cloud.feature.pack.gav}</location>
                                 </feature-pack>
                             </feature-packs>
                             <!-- layers are set by child modules, which also need to set <skip>false</skip> -->
@@ -159,6 +165,16 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>eap</id>
+            <properties>
+                <image.name.wildfly.runtime>registry.redhat.io/jboss-eap-8/eap8-openjdk17-runtime-openshift-rhel8:latest</image.name.wildfly.runtime>
+                <server.maven.plugin.groupId>org.jboss.eap.plugins</server.maven.plugin.groupId>
+                <server.maven.plugin.artifactId>eap-maven-plugin</server.maven.plugin.artifactId>
+                <server.feature.pack.gav>org.jboss.eap:wildfly-ee-galleon-pack:8.0.0.GA-redhat-00011</server.feature.pack.gav>
+                <cloud.feature.pack.gav>org.jboss.eap.cloud:eap-cloud-galleon-pack:1.0.0.Final-redhat-00008</cloud.feature.pack.gav>
+            </properties>
+        </profile>
     </profiles>
 
 </project>
diff --git a/images/web-clustering/pom.xml b/images/web-clustering/pom.xml
@@ -34,11 +34,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
+                <groupId>${server.maven.plugin.groupId}</groupId>
+                <artifactId>${server.maven.plugin.artifactId}</artifactId>
+                <version>${server.maven.plugin.version}</version>
                 <configuration>
                     <layers>
-                        <layer>cloud-server</layer>
+                        <layer>cloud-default-config</layer>
                         <layer>web-clustering</layer>
                     </layers>
                 </configuration>

diff --git a/pom.xml b/pom.xml
@@ -46,6 +46,7 @@
         <version.org.apache.maven.plugins.maven-failsafe-plugin>3.5.0</version.org.apache.maven.plugins.maven-failsafe-plugin>
         <version.org.codehaus.mojo.exec-maven-plugin>3.4.1</version.org.codehaus.mojo.exec-maven-plugin>
         <version.org.wildfly.plugins.wildfly-maven-plugin>5.0.1.Final</version.org.wildfly.plugins.wildfly-maven-plugin>
+        <version.org.jboss.eap.plugins.eap-maven-plugin>1.0.1.Final-redhat-00008</version.org.jboss.eap.plugins.eap-maven-plugin>
 
         <!-- Kubernetes registry parameters -->
         <wildfly.cloud.test.docker.host>localhost</wildfly.cloud.test.docker.host>