diff --git a/examples/wildfly-keycloak-saml-adapter/pom.xml b/examples/wildfly-keycloak-saml-adapter/pom.xml index dc5dba11..7b38d2b9 100644 --- a/examples/wildfly-keycloak-saml-adapter/pom.xml +++ b/examples/wildfly-keycloak-saml-adapter/pom.xml @@ -19,9 +19,9 @@ ${project.parent.parent.basedir}/ide-config 3.3.2 - 30.0.0.Final + 32.0.0.Final - 4.2.2.Final + 5.0.0.Final ${version.wildfly-server} org.wildfly:wildfly-galleon-pack:${version.wildfly-server} org.wildfly:wildfly-ee-galleon-pack:${version.wildfly-server} - org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.1.Final + org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final org.keycloak keycloak-saml-adapter-galleon-pack - 22.0.3 + 22.0.5 diff --git a/global-test.properties b/global-test.properties index 09c2162b..6ef4102a 100644 --- 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 index 558274a6..8b64b53a 100644 --- a/testsuite/deployments/openshift-jakarta-sample-standalone/pom.xml +++ b/testsuite/deployments/openshift-jakarta-sample-standalone/pom.xml @@ -20,11 +20,11 @@ 1.1 2.21.0 - 30.0.0.Final + 32.0.0.Final org.wildfly.plugins wildfly-maven-plugin - 4.2.2.Final + 5.0.0.Final org.wildfly.bom wildfly-ee @@ -44,7 +44,7 @@ --> org.wildfly:wildfly-galleon-pack:${version.wildfly-server} org.wildfly:wildfly-ee-galleon-pack:${version.wildfly-server} - org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.1.Final + org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final 3.3.2 2.35.0 diff --git a/testsuite/deployments/wildfly-shared/pom.xml b/testsuite/deployments/wildfly-shared/pom.xml index 2ea21204..3adf2a73 100644 --- a/testsuite/deployments/wildfly-shared/pom.xml +++ b/testsuite/deployments/wildfly-shared/pom.xml @@ -17,11 +17,11 @@ 1.3 - 30.0.0.Final + 32.0.0.Final org.wildfly.plugins wildfly-maven-plugin - 4.2.2.Final + 5.0.0.Final org.wildfly.bom wildfly-ee @@ -41,12 +41,12 @@ --> org.wildfly:wildfly-galleon-pack:${version.wildfly-server} org.wildfly:wildfly-ee-galleon-pack:${version.wildfly-server} - org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.1.Final + org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final - 10.0.0.Final + 11.0.1.Final diff --git a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java index d3685f07..92df4de8 100644 --- a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java +++ b/testsuite/integration-tests/src/test/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/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java index 9931f610..73c9467b 100644 --- a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java +++ b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/ProvisionerCleanupTestCase.java @@ -52,16 +52,16 @@ public class ProvisionerCleanupTestCase { private static Stream 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 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 provisionerProvider() { // RHBK , new KeycloakOperatorProvisioner( OpenShiftProvisionerTestBase.getKeycloakOperatorApplication()) - // RHDG - , new InfinispanOperatorProvisioner(OpenShiftProvisionerTestBase.getInfinispanOperatorApplication())); + ); } else { throw new IllegalStateException( String.format("Unknown Intersmash test suite execution profile: %s",