Merge pull request #172 from fabiobrz/bump.wildfly-eap

Bump WildFly/EAP bits defaults to latest
Intersmash · May 27, 2024 · e9011b4 · e9011b4
2 parents 7a89ce6 + 1d71ad5
commit e9011b4
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 19 deletions.
diff --git a/examples/wildfly-keycloak-saml-adapter/pom.xml b/examples/wildfly-keycloak-saml-adapter/pom.xml
@@ -19,9 +19,9 @@
         <formatting-style-base-directory>${project.parent.parent.basedir}/ide-config</formatting-style-base-directory>
         <version.maven-war-plugin>3.3.2</version.maven-war-plugin>
         <!-- Wildfly default version -->
-        <version.wildfly-server>30.0.0.Final</version.wildfly-server>
+        <version.wildfly-server>32.0.0.Final</version.wildfly-server>
         <!-- WildFly Maven Plugin version -->
-        <wildfly-maven-plugin.version>4.2.2.Final</wildfly-maven-plugin.version>
+        <wildfly-maven-plugin.version>5.0.0.Final</wildfly-maven-plugin.version>
         <!-- Default WildFly `ee` BOMs version is set here and can be overridden for pulling the right BOM -->
         <bom.wildfly-ee.version>${version.wildfly-server}</bom.wildfly-ee.version>
         <!--
@@ -35,12 +35,12 @@
         -->
         <wildfly.feature-pack.location>org.wildfly:wildfly-galleon-pack:${version.wildfly-server}</wildfly.feature-pack.location>
         <wildfly.ee-feature-pack.location>org.wildfly:wildfly-ee-galleon-pack:${version.wildfly-server}</wildfly.ee-feature-pack.location>
-        <wildfly.cloud-feature-pack.location>org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.1.Final</wildfly.cloud-feature-pack.location>
+        <wildfly.cloud-feature-pack.location>org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final</wildfly.cloud-feature-pack.location>
 
         <!-- Keycloak SAML -->
         <keycloak-saml-adapter-galleon-pack.groupId>org.keycloak</keycloak-saml-adapter-galleon-pack.groupId>
         <keycloak-saml-adapter-galleon-pack.artifactId>keycloak-saml-adapter-galleon-pack</keycloak-saml-adapter-galleon-pack.artifactId>
-        <keycloak-saml-adapter-galleon-pack.version>22.0.3</keycloak-saml-adapter-galleon-pack.version>
+        <keycloak-saml-adapter-galleon-pack.version>22.0.5</keycloak-saml-adapter-galleon-pack.version>
     </properties>
 
     <dependencyManagement>

diff --git a/global-test.properties b/global-test.properties
@@ -16,8 +16,8 @@ intersmash.bootable.jar.image=registry.access.redhat.com/ubi8/openjdk-17
 intersmash.mysql.image=quay.io/centos7/mysql-80-centos7:centos7
 intersmash.postgresql.image=quay.io/centos7/postgresql-13-centos7:centos7
 
-intersmash.wildfly.image=quay.io/wildfly/wildfly-s2i-jdk17:latest
-intersmash.wildfly.runtime.image=quay.io/wildfly/wildfly-runtime-jdk17:latest
+intersmash.wildfly.image=quay.io/wildfly/wildfly-s2i:latest
+intersmash.wildfly.runtime.image=quay.io/wildfly/wildfly-runtime:latest
 intersmash.wildfly.operators.catalog_source=community-operators-wildfly-operator
 intersmash.wildfly.operators.index_image=quay.io/operatorhubio/catalog:latest
 intersmash.wildfly.operators.package_manifest=wildfly

diff --git a/testsuite/deployments/openshift-jakarta-sample-standalone/pom.xml b/testsuite/deployments/openshift-jakarta-sample-standalone/pom.xml
@@ -20,11 +20,11 @@
         <version.ide-config>1.1</version.ide-config>
         <version.formatter-maven-plugin>2.21.0</version.formatter-maven-plugin>
 
-        <version.wildfly-server>30.0.0.Final</version.wildfly-server>
+        <version.wildfly-server>32.0.0.Final</version.wildfly-server>
         <!-- WildFly Maven Plugin coordinates -->
         <wildfly-maven-plugin.groupId>org.wildfly.plugins</wildfly-maven-plugin.groupId>
         <wildfly-maven-plugin.artifactId>wildfly-maven-plugin</wildfly-maven-plugin.artifactId>
-        <wildfly-maven-plugin.version>4.2.2.Final</wildfly-maven-plugin.version>
+        <wildfly-maven-plugin.version>5.0.0.Final</wildfly-maven-plugin.version>
         <!-- Default WildFly `ee` BOM version is set here and can be overridden for pulling the right BOM -->
         <bom.wildfly-ee.groupId>org.wildfly.bom</bom.wildfly-ee.groupId>
         <bom.wildfly-ee.artifactId>wildfly-ee</bom.wildfly-ee.artifactId>
@@ -44,7 +44,7 @@
         -->
         <wildfly.feature-pack.location>org.wildfly:wildfly-galleon-pack:${version.wildfly-server}</wildfly.feature-pack.location>
         <wildfly.ee-feature-pack.location>org.wildfly:wildfly-ee-galleon-pack:${version.wildfly-server}</wildfly.ee-feature-pack.location>
-        <wildfly.cloud-feature-pack.location>org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.1.Final</wildfly.cloud-feature-pack.location>
+        <wildfly.cloud-feature-pack.location>org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final</wildfly.cloud-feature-pack.location>
 
         <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
         <version.spotless-maven-plugin>2.35.0</version.spotless-maven-plugin>

diff --git a/testsuite/deployments/wildfly-shared/pom.xml b/testsuite/deployments/wildfly-shared/pom.xml
@@ -17,11 +17,11 @@
     <properties>
         <version.microprofile-config-api>1.3</version.microprofile-config-api>
 
-        <version.wildfly-server>30.0.0.Final</version.wildfly-server>
+        <version.wildfly-server>32.0.0.Final</version.wildfly-server>
         <!-- WildFly Maven Plugin coordinates -->
         <wildfly-maven-plugin.groupId>org.wildfly.plugins</wildfly-maven-plugin.groupId>
         <wildfly-maven-plugin.artifactId>wildfly-maven-plugin</wildfly-maven-plugin.artifactId>
-        <wildfly-maven-plugin.version>4.2.2.Final</wildfly-maven-plugin.version>
+        <wildfly-maven-plugin.version>5.0.0.Final</wildfly-maven-plugin.version>
         <!-- Default WildFly `ee` BOM version is set here and can be overridden for pulling the right BOM -->
         <bom.wildfly-ee.groupId>org.wildfly.bom</bom.wildfly-ee.groupId>
         <bom.wildfly-ee.artifactId>wildfly-ee</bom.wildfly-ee.artifactId>
@@ -41,12 +41,12 @@
         -->
         <wildfly.feature-pack.location>org.wildfly:wildfly-galleon-pack:${version.wildfly-server}</wildfly.feature-pack.location>
         <wildfly.ee-feature-pack.location>org.wildfly:wildfly-ee-galleon-pack:${version.wildfly-server}</wildfly.ee-feature-pack.location>
-        <wildfly.cloud-feature-pack.location>org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.1.Final</wildfly.cloud-feature-pack.location>
+        <wildfly.cloud-feature-pack.location>org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final</wildfly.cloud-feature-pack.location>
         <!--
             Default version for the Bootable JAR Plugin is set here and can be overridden, e.g. also for pulling
             the productized version
         -->
-        <version.wildfly-jar-maven-plugin>10.0.0.Final</version.wildfly-jar-maven-plugin>
+        <version.wildfly-jar-maven-plugin>11.0.1.Final</version.wildfly-jar-maven-plugin>
     </properties>
 
     <modules>

diff --git a/...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java b/...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java
@@ -216,6 +216,10 @@ public static Eap7LegacyS2iBuildTemplateApplication getEap7LegacyS2iBuildTemplat
 				envVars = new ArrayList<>();
 				// Set to allow cloning from Gitlab - any value here do the job
 				envVars.add(new EnvVarBuilder().withName("GIT_SSL_NO_VERIFY").withValue("").build());
+				// Let's build just the required deployment
+				envVars.add(new EnvVarBuilder().withName("MAVEN_ARGS_APPEND")
+						.withValue("-pl testsuite/deployments/eap7-shared/eap7-helloworld -am")
+						.build());
 			}
 
 			@Override

diff --git a/...t/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java b/...t/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java
@@ -52,16 +52,16 @@ public class ProvisionerCleanupTestCase {
 	private static Stream<OpenShiftProvisioner> provisionerProvider() {
 		if (IntersmashTestsuiteProperties.isCommunityTestExecutionProfileEnabled()) {
 			return Stream.of(
+					// Infinispan
+					new InfinispanOperatorProvisioner(OpenShiftProvisionerTestBase.getInfinispanOperatorApplication())
 					// WildFly
-					new WildflyBootableJarImageOpenShiftProvisioner(
+					, new WildflyBootableJarImageOpenShiftProvisioner(
 							OpenShiftProvisionerTestBase.getWildflyBootableJarOpenShiftApplication()),
 					new WildflyBootableJarImageOpenShiftProvisioner(
 							OpenShiftProvisionerTestBase.getEap7BootableJarOpenShiftApplication())
 					// Keycloak
 					, new KeycloakOperatorProvisioner(
 							OpenShiftProvisionerTestBase.getKeycloakOperatorApplication())
-					// Infinispan
-					, new InfinispanOperatorProvisioner(OpenShiftProvisionerTestBase.getInfinispanOperatorApplication())
 					// MySQL
 					, new MysqlImageOpenShiftProvisioner(OpenShiftProvisionerTestBase.getMysqlOpenShiftApplication())
 					// PostgreSql
@@ -71,8 +71,10 @@ private static Stream<OpenShiftProvisioner> provisionerProvider() {
 							OpenShiftProvisionerTestBase.getPostgreSQLTemplateOpenShiftApplication()));
 		} else if (IntersmashTestsuiteProperties.isProductizedTestExecutionProfileEnabled()) {
 			return Stream.of(
+					// RHDG
+					new InfinispanOperatorProvisioner(OpenShiftProvisionerTestBase.getInfinispanOperatorApplication())
 					// EAP latest GA
-					new WildflyImageOpenShiftProvisioner(
+					, new WildflyImageOpenShiftProvisioner(
 							OpenShiftProvisionerTestBase.getWildflyOpenShiftLocalBinaryTargetServerApplication())
 					// EAP 7
 					, new Eap7ImageOpenShiftProvisioner(OpenShiftProvisionerTestBase.getEap7OpenShiftImageApplication())
@@ -81,8 +83,7 @@ private static Stream<OpenShiftProvisioner> provisionerProvider() {
 					// RHBK
 					, new KeycloakOperatorProvisioner(
 							OpenShiftProvisionerTestBase.getKeycloakOperatorApplication())
-					// RHDG
-					, new InfinispanOperatorProvisioner(OpenShiftProvisionerTestBase.getInfinispanOperatorApplication()));
+			);
 		} else {
 			throw new IllegalStateException(
 					String.format("Unknown Intersmash test suite execution profile: %s",