diff --git a/README.md b/README.md index 8cf840ef7..36ba75cd2 100644 --- a/README.md +++ b/README.md @@ -31,28 +31,28 @@ having their own release cadence - it _could_ happen that a service version is p Feel free to submit an issue in such a case, Intersmash welcomes community contributions to keep the tooling up to date. -| Service | Supported version | Notes | -|:---------------------------------|:-----------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| ActiveMQ Artemis | 2.38.0 | The one provided by the custom index image, i.e. quay.io/jbossqe-eap/intersmash-activemq-operator-index:1.2.9, which lists to images in https://quay.io/organization/arkmq-org | -| Red Hat AMQ Broker | 7.12.z | Or _latest_ in the `:7.12` tag image stream, see registry.redhat.io/amq7/amq-broker-init-rhel8 | -| | | | -| Infinispan | 15.1.1.Final | Or _default_ provided by the default Infinispan Operator `stable` channel | -| Red Hat Data Grid | 8.5.2.GA | Or _default_ provided by the Red Hat DataGrid Operator `stable` channel | -| | | | -| Kafka provided by Strimzi | 3.8.0 | Provided by the Strimzi Operator `stable` channel | -| Red Hat AMQ Streams | 3.8.0.redhat-00007 | Or _default_, as provided by the Red Hat AMQ Streams Operator `stable` channel | -| | | | -| Keycloak | 26.0.7 | Or _default_, as provided by default by the Keycloak Operator `fast` channel | -| Red Hat Build of keycloak (RHBK) | 26.0.7.redhat-00001 | Or _latest_ in the `:26.0` tag image stream, see registry.redhat.io/rhbk/keycloak-rhel9 | -| Red Hat SSO - **DEPRECATED** | 7.6.z | The _latest_ in the `:7.6` tag image stream, see registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:7.6 | -| | | | -| WildFly | 32.0.0.Final | | -| Red Hat JBoss EAP 8 | JBoss EAP 8.0.x (and XP 5.x) | | -| Red Hat JBoss EAP 7 | JBoss EAP 7.4.z (and XP 4.z) | | -| | | | -| Hyperfoil | 0.24.2 | Supports provisioning via the Operator, both on **Kubernetes** and **OpenShift** | -| | | | -| Open Data Hub | 2.22.0 | Supports provisioning on OpenShift via the Operator | +| Service | Supported version | Notes | +|:---------------------------------|:-----------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ActiveMQ Artemis | 2.38.0 | The one provided by the custom index image, i.e. quay.io/jbossqe-eap/intersmash-activemq-operator-index:1.2.9, which lists to images in https://quay.io/organization/arkmq-org | +| Red Hat AMQ Broker | 7.12.z | Or _latest_ in the `:7.12` tag image stream, see registry.redhat.io/amq7/amq-broker-init-rhel8 | +| | | | +| Infinispan | 15.1.3.Final | Or _default_ provided by the default Infinispan Operator `stable` channel | +| Red Hat Data Grid | 8.5.2.GA | Or _default_ provided by the Red Hat DataGrid Operator `stable` channel | +| | | | +| Kafka provided by Strimzi | 3.9.0 | Provided by the Strimzi Operator `stable` channel | +| Streams for Apache Kafka | 3.8.0.redhat-00007 | Or _default_, as provided by the Red Hat Streams for Apache Kafka Operator `stable` channel | +| | | | +| Keycloak | 26.0.8 | Or _default_, as provided by default by the Keycloak Operator `fast` channel | +| Red Hat Build of keycloak (RHBK) | 26.0.8.redhat-00001 | Or _latest_ in the `:26.0` tag image stream, see registry.redhat.io/rhbk/keycloak-rhel9 | +| Red Hat SSO - **DEPRECATED** | 7.6.z | The _latest_ in the `:7.6` tag image stream, see registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:7.6 | +| | | | +| WildFly | 32.0.0.Final | | +| Red Hat JBoss EAP 8 | JBoss EAP 8.0.x (and XP 5.x) | | +| Red Hat JBoss EAP 7 | JBoss EAP 7.4.z (and XP 4.z) | | +| | | | +| Hyperfoil | 0.24.2 | Supports provisioning via the Operator, both on **Kubernetes** and **OpenShift** | +| | | | +| Open Data Hub | 2.22.0 | Supports provisioning on OpenShift via the Operator | Since multiple deliverables can be bound to a given service version, e.g.: container images, operator CRs, or Helm Charts, more information can be found in [the provisioners' documentation](./provisioners/README.md), or in the resources there linked. @@ -134,6 +134,22 @@ artifacts, which is done by enabling the `ts.wildfly.target-distribution.eap` or mvn test -pl testsuite/ -Pts.execution-profile.prod -Pts.wildfly.target-distribution.eap ``` +Regarding EAP _minor_ version, Intersmash supports provisioning both EAP 8.0 and EAP 8.1, and the deployments used by the +Intersmash testsuite can be built on related artifacts and feature packs by enabling either the `ts.eap-stream.80`, +or the `ts.eap-stream.81` profile, e.g.: + +```shell +mvn test -pl testsuite/ -Pts.execution-profile.prod -Pts.wildfly.target-distribution.eap -Pts.eap-stream.80 +``` + +Regarding EAP XP _major_ version, Intersmash supports provisioning both XP 5 and XP 6, and the deployments used by the +Intersmash testsuite can be built on related artifacts and feature packs by enabling either the `ts.eapxp-stream.xp5`, +or the `ts.eapxp-stream.xp6` profile, e.g.: + +```shell +mvn test -pl testsuite/ -Pts.execution-profile.prod -Pts.wildfly.target-distribution.eapxp -Pts.eapxp-stream.xp5 +``` + * Run Kubernetes integration tests: ```shell mvn test -pl testsuite/ -Pts.execution-profile.community -Pts.k8s diff --git a/examples/wildfly-keycloak-saml-adapter/pom.xml b/examples/wildfly-keycloak-saml-adapter/pom.xml index bb4defb30..70cc8c3ef 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 - 32.0.0.Final + 35.0.0.Final - 5.0.0.Final + 5.1.1.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:6.0.0.Final + org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final org.keycloak diff --git a/examples/ws-bootable-jar-example/pom.xml b/examples/ws-bootable-jar-example/pom.xml index db1c97bb1..d7a16d326 100644 --- a/examples/ws-bootable-jar-example/pom.xml +++ b/examples/ws-bootable-jar-example/pom.xml @@ -30,15 +30,15 @@ 1.3 - 4.0.0.Final + 5.1.1.Final 3.3.2 - 10.0.0.Final + 12.0.0.Final - 29.0.1.Final + 35.0.0.Final diff --git a/examples/wstrust/pom.xml b/examples/wstrust/pom.xml index 6eccb7ad8..f2da8d038 100644 --- a/examples/wstrust/pom.xml +++ b/examples/wstrust/pom.xml @@ -37,7 +37,7 @@ Default version for the Bootable JAR Plugin is set here and can be overridden, e.g. also for pulling the productized version --> - 10.0.0.Final + 12.0.0.Final diff --git a/examples/wstrust/service/pom.xml b/examples/wstrust/service/pom.xml index 7ad1f5a7f..c42ff517f 100644 --- a/examples/wstrust/service/pom.xml +++ b/examples/wstrust/service/pom.xml @@ -44,7 +44,7 @@ 3.3.2 - 29.0.1.Final + 35.0.0.Final diff --git a/examples/wstrust/sts/pom.xml b/examples/wstrust/sts/pom.xml index 61b1531b1..f099010d7 100644 --- a/examples/wstrust/sts/pom.xml +++ b/examples/wstrust/sts/pom.xml @@ -44,7 +44,7 @@ 3.3.2 - 29.0.1.Final + 35.0.0.Final diff --git a/global-test.properties b/global-test.properties index d993db56f..c98454e53 100644 --- a/global-test.properties +++ b/global-test.properties @@ -9,32 +9,48 @@ xtf.record.always=false # Avoid starting multiple builds at once as it might cause that builds starts to hang xtf.junit.prebuilder.synchronized=true -# Bootable JAR OpenJDK base image -intersmash.bootable.jar.image=registry.access.redhat.com/ubi8/openjdk-17 - # DB 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:latest -intersmash.wildfly.runtime.image=quay.io/wildfly/wildfly-runtime:latest +intersmash.wildfly.image=quay.io/wildfly/wildfly-s2i:2.1.0-jdk21 +intersmash.wildfly.runtime.image=quay.io/wildfly/wildfly-runtime:2.1.0-jdk21 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 intersmash.wildfly.operators.channel=alpha intersmash.wildfly.helm.charts.repo=https://github.com/wildfly/wildfly-charts.git -intersmash.wildfly.helm.charts.branch=wildfly-2.3.2 +intersmash.wildfly.helm.charts.branch=wildfly-2.4.0 intersmash.wildfly.helm.charts.name=wildfly +intersmash.bootable.jar.image=registry.access.redhat.com/ubi8/openjdk-17 + +intersmash.eap7.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-openshift-rhel8:latest +intersmash.eap7.runtime.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-runtime-openshift-rhel8:latest +intersmash.eap7.templates.base.url=https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/ +intersmash.eap7.templates.path=templates/ intersmash.activemq.operators.catalog_source=intersmash-activemq-operator-index intersmash.activemq.operators.index_image=quay.io/jbossqe-eap/intersmash-activemq-operator-index:1.2.9 intersmash.activemq.operators.package_manifest=activemq-artemis-operator intersmash.activemq.operators.channel=upstream -intersmash.keycloak.image=quay.io/keycloak/keycloak:26.0.7 +intersmash.keycloak.image=quay.io/keycloak/keycloak:26.0 intersmash.keycloak.operators.catalog_source=community-operators intersmash.keycloak.operators.channel=fast +intersmash.keycloak.operators.package_manifest=keycloak-operator + +intersmash.rhsso.image=registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:7.6 +intersmash.rhsso.operators.catalog_source=redhat-operators +intersmash.rhsso.operators.package_manifest=rhsso-operator +intersmash.rhsso.templates=https://raw.githubusercontent.com/jboss-container-images/redhat-sso-7-openshift-image/sso76-dev/templates/ + +intersmash.infinispan.image= +intersmash.infinispan.operators.catalog_source=community-operators +intersmash.infinispan.operators.package_manifest=infinispan +intersmash.infinispan.operators.channel= +intersmash.kafka.operators.catalog_source=community-operators +intersmash.kafka.operators.package_manifest=strimzi-kafka-operator intersmash.kafka.operators.channel=stable intersmash.hyperfoil.operators.catalog_source=community-operators diff --git a/pom.xml b/pom.xml index cf4be7536..0e64e3790 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ pom Intersmash Parent: Aggregator - Intersmash - Run your cloud-native tests with Java! + Intersmash - Cloud-native tests with Java! http://github.com/Intersmash/intersmash @@ -129,6 +129,8 @@ 3.3.9 1.7.0 3.24.2 + + ${client.jvm.jpms.args} diff --git a/provisioners/pom.xml b/provisioners/pom.xml index 55b4e86dc..89c78cfba 100644 --- a/provisioners/pom.xml +++ b/provisioners/pom.xml @@ -271,7 +271,7 @@ generate - + ${basedir}/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/wildfly target/generated-sources org.jboss.intersmash.model.helm.charts.values.wildfly @@ -289,6 +289,20 @@ org.jboss.intersmash.model.helm.charts.values.eap8 + + + charts.values.generate-schema-model.eap81 + + generate + + + + ${basedir}/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/eap81 + ${project.build.directory}/generated-sources/ + org.jboss.intersmash.model.helm.charts.values.eap81 + + + charts.values.generate-schema-model.xp5 @@ -302,6 +316,19 @@ + + charts.values.generate-schema-model.xp6 + + generate + + + + ${basedir}/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/xp6 + ${project.build.directory}/generated-sources/ + org.jboss.intersmash.model.helm.charts.values.xp6 + + + + + + community @@ -83,6 +88,59 @@ eap + + ts.wildfly.target-distribution.eapxp + + + eapxp + + + + + ts.eap-stream.80 + + + eap80 + + + + + ts.eap-stream.81 + + + eap81 + + + + + ts.eapxp-stream.xp5 + + + eapxp5 + + + + + ts.eapxp-stream.xp6 + + + eapxp6 + + doc diff --git a/testsuite/deployments/deployments-provider/src/main/java/org/jboss/intersmash/test/deployments/TestDeploymentProperties.java b/testsuite/deployments/deployments-provider/src/main/java/org/jboss/intersmash/test/deployments/TestDeploymentProperties.java index 396a36b42..f7c3265a3 100644 --- a/testsuite/deployments/deployments-provider/src/main/java/org/jboss/intersmash/test/deployments/TestDeploymentProperties.java +++ b/testsuite/deployments/deployments-provider/src/main/java/org/jboss/intersmash/test/deployments/TestDeploymentProperties.java @@ -23,12 +23,18 @@ */ public class TestDeploymentProperties { static Properties properties; - private static String VERSION = "version"; - private static String GROUPD_ID = "groupID"; - private static String DEPLOYMENTS_PROVIDER_PATH = "deploymentsProviderPath"; - private static String WILDFLY_DEPLOYMENTS_BUILD_PROFILE = "wildflyDeploymentsBuildProfile"; - public static String WILDFLY_DEPLOYMENTS_BUILD_PROFILE_VALUE_EAP = "eap"; - public static String WILDFLY_DEPLOYMENTS_BUILD_PROFILE_VALUE_EAP_XP = "eapxp"; + private static final String VERSION = "version"; + private static final String GROUPD_ID = "groupID"; + private static final String DEPLOYMENTS_PROVIDER_PATH = "deploymentsProviderPath"; + private static final String WILDFLY_DEPLOYMENTS_BUILD_PROFILE = "wildflyDeploymentsBuildProfile"; + public static final String WILDFLY_DEPLOYMENTS_BUILD_PROFILE_VALUE_EAP = "eap"; + public static final String WILDFLY_DEPLOYMENTS_BUILD_PROFILE_VALUE_EAP_XP = "eapxp"; + private static final String WILDFLY_DEPLOYMENTS_BUILD_STREAM = "wildflyDeploymentsBuildStream"; + public static final String WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_COMMUNITY = "community"; + public static final String WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_80 = "eap80"; + public static final String WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_81 = "eap81"; + public static final String WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_XP5 = "eapxp5"; + public static final String WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_XP6 = "eapxp6"; static { properties = new Properties(); @@ -55,15 +61,39 @@ public static String getWildflyDeploymentsBuildProfile() { return properties.getProperty(WILDFLY_DEPLOYMENTS_BUILD_PROFILE); } + public static String getWildflyDeploymentsBuildStream() { + return properties.getProperty(WILDFLY_DEPLOYMENTS_BUILD_STREAM); + } + public static Boolean isWildFlyDeploymentsBuildProfileEnabled() { return "".equals(getWildflyDeploymentsBuildProfile()); } + public static Boolean isCommunityDeploymentsBuildStreamEnabled() { + return WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_COMMUNITY.equals(getWildflyDeploymentsBuildStream()); + } + public static Boolean isEapDeploymentsBuildProfileEnabled() { return WILDFLY_DEPLOYMENTS_BUILD_PROFILE_VALUE_EAP.equals(getWildflyDeploymentsBuildProfile()); } + public static Boolean isEap80DeploymentsBuildStreamEnabled() { + return WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_80.equals(getWildflyDeploymentsBuildStream()); + } + + public static Boolean isEap81DeploymentsBuildStreamEnabled() { + return WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_81.equals(getWildflyDeploymentsBuildStream()); + } + public static Boolean isEapXpDeploymentsBuildProfileEnabled() { return WILDFLY_DEPLOYMENTS_BUILD_PROFILE_VALUE_EAP_XP.equals(getWildflyDeploymentsBuildProfile()); } + + public static Boolean isEapXp5DeploymentsBuildStreamEnabled() { + return WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_XP5.equals(getWildflyDeploymentsBuildStream()); + } + + public static Boolean isEapXp6DeploymentsBuildStreamEnabled() { + return WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_XP6.equals(getWildflyDeploymentsBuildStream()); + } } diff --git a/testsuite/deployments/deployments-provider/src/main/java/org/jboss/intersmash/test/deployments/WildflyDeploymentApplicationConfiguration.java b/testsuite/deployments/deployments-provider/src/main/java/org/jboss/intersmash/test/deployments/WildflyDeploymentApplicationConfiguration.java index 51cc5df53..81c6519ea 100644 --- a/testsuite/deployments/deployments-provider/src/main/java/org/jboss/intersmash/test/deployments/WildflyDeploymentApplicationConfiguration.java +++ b/testsuite/deployments/deployments-provider/src/main/java/org/jboss/intersmash/test/deployments/WildflyDeploymentApplicationConfiguration.java @@ -253,4 +253,32 @@ default String generateAdditionalMavenArgs() { : " -Dmaven-mirror.url=" + this.getMavenMirrorUrl())); return result; } + + default String getWildflyDeploymentVariantFromStream(final String deploymentStream) { + switch (deploymentStream) { + case TestDeploymentProperties.WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_80: + case TestDeploymentProperties.WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_81: + return "eap"; + case TestDeploymentProperties.WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_XP5: + case TestDeploymentProperties.WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_XP6: + return "eapxp"; + default: + throw new IllegalStateException("Unexpected value: " + deploymentStream); + } + } + + default String getWildflyDeploymentVariantProfileNameFromStream(final String deploymentStream) { + switch (deploymentStream) { + case TestDeploymentProperties.WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_80: + return "80"; + case TestDeploymentProperties.WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_81: + return "81"; + case TestDeploymentProperties.WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_XP5: + return "xp5"; + case TestDeploymentProperties.WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_EAP_XP6: + return "xp6"; + default: + throw new IllegalStateException("Unexpected value: " + deploymentStream); + } + } } diff --git a/testsuite/deployments/deployments-provider/src/main/resources/.properties b/testsuite/deployments/deployments-provider/src/main/resources/.properties index 1fed79fc3..3faf2d8e1 100644 --- a/testsuite/deployments/deployments-provider/src/main/resources/.properties +++ b/testsuite/deployments/deployments-provider/src/main/resources/.properties @@ -2,3 +2,4 @@ version=${project.version} groupID=${project.groupId} deploymentsProviderPath=${project.basedir} wildflyDeploymentsBuildProfile=${intersmash.deployments.wildfly.build.profile} +wildflyDeploymentsBuildStream=${intersmash.deployments.wildfly.build.stream} diff --git a/testsuite/deployments/eap7-shared/pom.xml b/testsuite/deployments/eap7-shared/pom.xml index 79d5e9a63..1f6cdfbe0 100644 --- a/testsuite/deployments/eap7-shared/pom.xml +++ b/testsuite/deployments/eap7-shared/pom.xml @@ -20,14 +20,14 @@ 1.8 UTF-8 - 7.4.13.GA - 4.0.1.GA-7.4.13.GA + 7.4.20.GA + 4.0.2.GA-7.4.20.GA org.jboss.bom jboss-eap-jakartaee8 ${jboss-eap7.version} - org.jboss.eap:wildfly-galleon-pack:4.0.1.GA-redhat-00007 + org.jboss.eap:wildfly-galleon-pack:4.0.2.GA-redhat-00009 diff --git a/testsuite/deployments/openshift-jakarta-sample-standalone/pom.xml b/testsuite/deployments/openshift-jakarta-sample-standalone/pom.xml index a97013f55..74bc6acb5 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 - 32.0.0.Final + 35.0.0.Final org.wildfly.plugins wildfly-maven-plugin - 5.0.0.Final + 5.1.1.Final org.wildfly.bom wildfly-ee @@ -45,6 +45,13 @@ org.wildfly:wildfly-galleon-pack:${version.wildfly-server} org.wildfly:wildfly-ee-galleon-pack:${version.wildfly-server} org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final + + + + + + + 3.3.2 2.35.0 @@ -202,8 +209,14 @@ - ts.wildfly.target-distribution.eap + + ts.eap-stream.81 + + eap81 org.jboss.eap.plugins eap-maven-plugin @@ -230,6 +243,45 @@ eap-8.0 1.0.1.GA-redhat-00003 + + + + ts.eap-stream.80 + + + eap80 + + org.jboss.eap.plugins + eap-maven-plugin + 1.0.0.Final-redhat-00014 + + org.jboss.bom + jboss-eap-ee + 8.0.0.GA-redhat-00009 + + org.jboss.eap:wildfly-ee-galleon-pack:8.0.0.GA-redhat-00011 + org.jboss.eap:wildfly-ee-galleon-pack:8.0.0.GA-redhat-00011 + org.jboss.eap.cloud:eap-cloud-galleon-pack:1.0.0.Final-redhat-00008 + + org.jboss.eap.channels + eap-8.0 + 1.0.1.GA-redhat-00003 + + + + ts.wildfly.target-distribution.eap @@ -275,31 +327,72 @@ + - - ts.wildfly.target-distribution.eapxp + + ts.eapxp-stream.xp6 - + + eapxp6 + org.jboss.eap.plugins eap-maven-plugin 1.0.0.Final-redhat-00014 - + org.jboss.bom jboss-eap-xp-microprofile 5.0.0.GA-redhat-00009 - + org.jboss.eap.channels eap-8.0 1.0.1.GA-redhat-00003 - + org.jboss.eap.channels eap-xp-5.0 1.0.0.GA-redhat-00006 - + org.jboss.eap.xp:wildfly-galleon-pack:5.0.0.GA-redhat-00005 - org.jboss.eap.cloud:eap-cloud-galleon-pack:1.0.0.Final-redhat-00008 + + + + + ts.eapxp-stream.xp5 + + + eapxp5 + + org.jboss.eap.plugins + eap-maven-plugin + 1.0.0.Final-redhat-00014 + + org.jboss.bom + jboss-eap-xp-microprofile + 5.0.0.GA-redhat-00009 + + org.jboss.eap.channels + eap-8.0 + 1.0.1.GA-redhat-00003 + + org.jboss.eap.channels + eap-xp-5.0 + 1.0.0.GA-redhat-00006 + + org.jboss.eap.xp:wildfly-galleon-pack:5.0.0.GA-redhat-00005 + org.jboss.eap.cloud:eap-cloud-galleon-pack:1.0.0.Final-redhat-00008 + + + + + + ts.wildfly.target-distribution.eapxp diff --git a/testsuite/deployments/pom.xml b/testsuite/deployments/pom.xml index c71583d85..480010a77 100644 --- a/testsuite/deployments/pom.xml +++ b/testsuite/deployments/pom.xml @@ -26,9 +26,6 @@ 3.0.0-M1 3.3.2 - - - diff --git a/testsuite/deployments/wildfly-shared/pom.xml b/testsuite/deployments/wildfly-shared/pom.xml index ce42894a0..b2c0994b5 100644 --- a/testsuite/deployments/wildfly-shared/pom.xml +++ b/testsuite/deployments/wildfly-shared/pom.xml @@ -17,18 +17,18 @@ 1.3 - 32.0.0.Final + 35.0.0.Final org.wildfly.plugins wildfly-maven-plugin - 5.0.0.Final + 5.1.1.Final org.wildfly.bom wildfly-ee ${version.wildfly-server} org.wildfly.bom - wildfly-microprofile + wildfly-expansion ${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:6.0.0.Final + org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final - 11.0.1.Final + 12.0.0.Final + + + + + + + @@ -149,8 +156,14 @@ - ts.wildfly.target-distribution.eap + + ts.eap-stream.81 + + eap81 org.jboss.eap.plugins eap-maven-plugin @@ -177,6 +190,46 @@ eap-8.0 1.0.1.GA-redhat-00003 + + + + ts.eap-stream.80 + + + eap80 + + org.jboss.eap.plugins + eap-maven-plugin + 1.0.0.Final-redhat-00014 + + org.jboss.bom + jboss-eap-ee + 8.0.0.GA-redhat-00009 + + org.jboss.eap:wildfly-ee-galleon-pack:8.0.0.GA-redhat-00011 + org.jboss.eap:wildfly-ee-galleon-pack:8.0.0.GA-redhat-00011 + org.jboss.eap.cloud:eap-cloud-galleon-pack:1.0.0.Final-redhat-00008 + + org.jboss.eap.channels + eap-8.0 + 1.0.1.GA-redhat-00003 + + + + + ts.wildfly.target-distribution.eap @@ -261,29 +314,70 @@ - - ts.wildfly.target-distribution.eapxp + + ts.eapxp-stream.xp6 - + + eapxp6 + org.jboss.eap.plugins eap-maven-plugin 1.0.0.Final-redhat-00014 - + org.jboss.bom jboss-eap-xp-microprofile 5.0.0.GA-redhat-00009 - + org.jboss.eap.channels eap-8.0 1.0.1.GA-redhat-00003 - + org.jboss.eap.channels eap-xp-5.0 1.0.0.GA-redhat-00006 - + org.jboss.eap.xp:wildfly-galleon-pack:5.0.0.GA-redhat-00005 org.jboss.eap.cloud:eap-cloud-galleon-pack:1.0.0.Final-redhat-00008 + + + + + ts.eapxp-stream.xp5 + + + eapxp5 + + org.jboss.eap.plugins + eap-maven-plugin + 1.0.0.Final-redhat-00014 + + org.jboss.bom + jboss-eap-xp-microprofile + 5.0.0.GA-redhat-00009 + + org.jboss.eap.channels + eap-8.0 + 1.0.1.GA-redhat-00003 + + org.jboss.eap.channels + eap-xp-5.0 + 1.0.0.GA-redhat-00006 + + org.jboss.eap.xp:wildfly-galleon-pack:5.0.0.GA-redhat-00005 + org.jboss.eap.cloud:eap-cloud-galleon-pack:1.0.0.Final-redhat-00008 + + + + + + ts.wildfly.target-distribution.eapxp diff --git a/testsuite/integration-tests/eap80-global-test.properties b/testsuite/integration-tests/eap80-global-test.properties new file mode 100644 index 000000000..6c383059d --- /dev/null +++ b/testsuite/integration-tests/eap80-global-test.properties @@ -0,0 +1,63 @@ +xtf.waiting.timeout.cleanup=60000 +xtf.waiting.timeout=600000 + +# OpenShift logs +xtf.record.dir=log +xtf.record.before=true +xtf.record.always=false + +# Avoid starting multiple builds at once as it might cause that builds starts to hang +xtf.junit.prebuilder.synchronized=true + +# DB +intersmash.mysql.image=quay.io/centos7/mysql-80-centos7:centos7 +intersmash.postgresql.image=quay.io/centos7/postgresql-13-centos7:centos7 + +intersmash.wildfly.image=registry.redhat.io/jboss-eap-8/eap8-openjdk17-builder-openshift-rhel8:1.0.1.GA +intersmash.wildfly.runtime.image=registry.redhat.io/jboss-eap-8/eap8-openjdk17-runtime-openshift-rhel8:1.0.1.GA +intersmash.wildfly.operators.catalog_source=redhat-operators +intersmash.wildfly.operators.index_image= +intersmash.wildfly.operators.package_manifest=eap +intersmash.wildfly.operators.channel=stable +intersmash.wildfly.helm.charts.repo=https://github.com/jbossas/eap-charts.git +intersmash.wildfly.helm.charts.branch=eap8-1.1.2 +intersmash.wildfly.helm.charts.name=eap8 +intersmash.bootable.jar.image=registry.access.redhat.com/ubi8/openjdk-17 + +intersmash.eap7.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-openshift-rhel8:latest +intersmash.eap7.runtime.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-runtime-openshift-rhel8:latest +intersmash.eap7.templates.base.url=https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/ +intersmash.eap7.templates.path=templates/ + +intersmash.activemq.image=registry.redhat.io/amq7/amq-broker-rhel8:7.12 +intersmash.activemq.init.image=registry.redhat.io/amq7/amq-broker-init-rhel8:7.12 +intersmash.activemq.operators.catalog_source=redhat-operators +intersmash.activemq.operators.index_image= +intersmash.activemq.operators.package_manifest=amq-broker-rhel8 +intersmash.activemq.operators.channel=7.12.x + +intersmash.keycloak.image=registry.redhat.io/rhbk/keycloak-rhel9:26.0 +intersmash.keycloak.operators.index_image= +intersmash.keycloak.operators.catalog_source=redhat-operators +intersmash.keycloak.operators.channel=stable-v26.0 +intersmash.keycloak.operators.package_manifest=rhbk-operator + +intersmash.rhsso.image=registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:7.6 +intersmash.rhsso.operators.catalog_source=redhat-operators +intersmash.rhsso.operators.package_manifest=rhsso-operator +intersmash.rhsso.templates=https://raw.githubusercontent.com/jboss-container-images/redhat-sso-7-openshift-image/sso76-dev/templates/ + +intersmash.infinispan.image=registry.redhat.io/datagrid/datagrid-8-rhel9:1.5 +intersmash.infinispan.operators.catalog_source=redhat-operators +intersmash.infinispan.operators.package_manifest=datagrid +intersmash.infinispan.operators.channel=stable + +intersmash.kafka.operators.catalog_source=redhat-operators +intersmash.kafka.operators.package_manifest=amq-streams +intersmash.kafka.operators.channel=stable + +intersmash.hyperfoil.operators.catalog_source=community-operators +intersmash.hyperfoil.operators.package_manifest=hyperfoil-bundle + +intersmash.olm.operators.catalog_source=redhat-operators +intersmash.olm.operators.namespace=openshift-marketplace diff --git a/testsuite/integration-tests/eap81-global-test.properties b/testsuite/integration-tests/eap81-global-test.properties new file mode 100644 index 000000000..1a8b78a45 --- /dev/null +++ b/testsuite/integration-tests/eap81-global-test.properties @@ -0,0 +1,63 @@ +xtf.waiting.timeout.cleanup=60000 +xtf.waiting.timeout=600000 + +# OpenShift logs +xtf.record.dir=log +xtf.record.before=true +xtf.record.always=false + +# Avoid starting multiple builds at once as it might cause that builds starts to hang +xtf.junit.prebuilder.synchronized=true + +# DB +intersmash.mysql.image=quay.io/centos7/mysql-80-centos7:centos7 +intersmash.postgresql.image=quay.io/centos7/postgresql-13-centos7:centos7 + +intersmash.wildfly.image=registry.redhat.io/jboss-eap-8/eap8-openjdk17-builder-openshift-rhel8:1.0.1.GA +intersmash.wildfly.runtime.image=registry.redhat.io/jboss-eap-8/eap8-openjdk17-runtime-openshift-rhel8:1.0.1.GA +intersmash.wildfly.operators.catalog_source=redhat-operators +intersmash.wildfly.operators.index_image= +intersmash.wildfly.operators.package_manifest=eap +intersmash.wildfly.operators.channel=stable +intersmash.wildfly.helm.charts.repo=https://github.com/jbossas/eap-charts.git +intersmash.wildfly.helm.charts.branch=eap81-dev +intersmash.wildfly.helm.charts.name=eap81 +intersmash.bootable.jar.image=registry.access.redhat.com/ubi8/openjdk-17 + +intersmash.eap7.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-openshift-rhel8:latest +intersmash.eap7.runtime.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-runtime-openshift-rhel8:latest +intersmash.eap7.templates.base.url=https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/ +intersmash.eap7.templates.path=templates/ + +intersmash.activemq.image=registry.redhat.io/amq7/amq-broker-rhel8:7.12 +intersmash.activemq.init.image=registry.redhat.io/amq7/amq-broker-init-rhel8:7.12 +intersmash.activemq.operators.catalog_source=redhat-operators +intersmash.activemq.operators.index_image= +intersmash.activemq.operators.package_manifest=amq-broker-rhel8 +intersmash.activemq.operators.channel=7.12.x + +intersmash.keycloak.image=registry.redhat.io/rhbk/keycloak-rhel9:26.0 +intersmash.keycloak.operators.index_image= +intersmash.keycloak.operators.catalog_source=redhat-operators +intersmash.keycloak.operators.channel=stable-v26.0 +intersmash.keycloak.operators.package_manifest=rhbk-operator + +intersmash.rhsso.image=registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:7.6 +intersmash.rhsso.operators.catalog_source=redhat-operators +intersmash.rhsso.operators.package_manifest=rhsso-operator +intersmash.rhsso.templates=https://raw.githubusercontent.com/jboss-container-images/redhat-sso-7-openshift-image/sso76-dev/templates/ + +intersmash.infinispan.image=registry.redhat.io/datagrid/datagrid-8-rhel9:1.5 +intersmash.infinispan.operators.catalog_source=redhat-operators +intersmash.infinispan.operators.package_manifest=datagrid +intersmash.infinispan.operators.channel=stable + +intersmash.kafka.operators.catalog_source=redhat-operators +intersmash.kafka.operators.package_manifest=amq-streams +intersmash.kafka.operators.channel=stable + +intersmash.hyperfoil.operators.catalog_source=community-operators +intersmash.hyperfoil.operators.package_manifest=hyperfoil-bundle + +intersmash.olm.operators.catalog_source=redhat-operators +intersmash.olm.operators.namespace=openshift-marketplace diff --git a/testsuite/integration-tests/eapxp5-global-test.properties b/testsuite/integration-tests/eapxp5-global-test.properties new file mode 100644 index 000000000..861cb2d8b --- /dev/null +++ b/testsuite/integration-tests/eapxp5-global-test.properties @@ -0,0 +1,63 @@ +xtf.waiting.timeout.cleanup=60000 +xtf.waiting.timeout=600000 + +# OpenShift logs +xtf.record.dir=log +xtf.record.before=true +xtf.record.always=false + +# Avoid starting multiple builds at once as it might cause that builds starts to hang +xtf.junit.prebuilder.synchronized=true + +# DB +intersmash.mysql.image=quay.io/centos7/mysql-80-centos7:centos7 +intersmash.postgresql.image=quay.io/centos7/postgresql-13-centos7:centos7 + +intersmash.wildfly.image=registry.redhat.io/jboss-eap-8/eap8-openjdk17-builder-openshift-rhel8:1.0.1.GA +intersmash.wildfly.runtime.image=registry.redhat.io/jboss-eap-8/eap8-openjdk17-runtime-openshift-rhel8:1.0.1.GA +intersmash.wildfly.operators.catalog_source=redhat-operators +intersmash.wildfly.operators.index_image= +intersmash.wildfly.operators.package_manifest=eap +intersmash.wildfly.operators.channel=stable +intersmash.wildfly.helm.charts.repo=https://github.com/jbossas/eap-charts.git +intersmash.wildfly.helm.charts.branch=eap-xp5-1.0.0 +intersmash.wildfly.helm.charts.name=eap-xp5 +intersmash.bootable.jar.image=registry.access.redhat.com/ubi8/openjdk-17 + +intersmash.eap7.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-openshift-rhel8:latest +intersmash.eap7.runtime.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-runtime-openshift-rhel8:latest +intersmash.eap7.templates.base.url=https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/ +intersmash.eap7.templates.path=templates/ + +intersmash.activemq.image=registry.redhat.io/amq7/amq-broker-rhel8:7.12 +intersmash.activemq.init.image=registry.redhat.io/amq7/amq-broker-init-rhel8:7.12 +intersmash.activemq.operators.catalog_source=redhat-operators +intersmash.activemq.operators.index_image= +intersmash.activemq.operators.package_manifest=amq-broker-rhel8 +intersmash.activemq.operators.channel=7.12.x + +intersmash.keycloak.image=registry.redhat.io/rhbk/keycloak-rhel9:26.0 +intersmash.keycloak.operators.index_image= +intersmash.keycloak.operators.catalog_source=redhat-operators +intersmash.keycloak.operators.channel=stable-v26.0 +intersmash.keycloak.operators.package_manifest=rhbk-operator + +intersmash.rhsso.image=registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:7.6 +intersmash.rhsso.operators.catalog_source=redhat-operators +intersmash.rhsso.operators.package_manifest=rhsso-operator +intersmash.rhsso.templates=https://raw.githubusercontent.com/jboss-container-images/redhat-sso-7-openshift-image/sso76-dev/templates/ + +intersmash.infinispan.image=registry.redhat.io/datagrid/datagrid-8-rhel9:1.5 +intersmash.infinispan.operators.catalog_source=redhat-operators +intersmash.infinispan.operators.package_manifest=datagrid +intersmash.infinispan.operators.channel=stable + +intersmash.kafka.operators.catalog_source=redhat-operators +intersmash.kafka.operators.package_manifest=amq-streams +intersmash.kafka.operators.channel=stable + +intersmash.hyperfoil.operators.catalog_source=community-operators +intersmash.hyperfoil.operators.package_manifest=hyperfoil-bundle + +intersmash.olm.operators.catalog_source=redhat-operators +intersmash.olm.operators.namespace=openshift-marketplace diff --git a/testsuite/integration-tests/eapxp6-global-test.properties b/testsuite/integration-tests/eapxp6-global-test.properties new file mode 100644 index 000000000..445878af3 --- /dev/null +++ b/testsuite/integration-tests/eapxp6-global-test.properties @@ -0,0 +1,63 @@ +xtf.waiting.timeout.cleanup=60000 +xtf.waiting.timeout=600000 + +# OpenShift logs +xtf.record.dir=log +xtf.record.before=true +xtf.record.always=false + +# Avoid starting multiple builds at once as it might cause that builds starts to hang +xtf.junit.prebuilder.synchronized=true + +# DB +intersmash.mysql.image=quay.io/centos7/mysql-80-centos7:centos7 +intersmash.postgresql.image=quay.io/centos7/postgresql-13-centos7:centos7 + +intersmash.wildfly.image=registry.redhat.io/jboss-eap-8/eap8-openjdk17-builder-openshift-rhel8:1.0.1.GA +intersmash.wildfly.runtime.image=registry.redhat.io/jboss-eap-8/eap8-openjdk17-runtime-openshift-rhel8:1.0.1.GA +intersmash.wildfly.operators.catalog_source=redhat-operators +intersmash.wildfly.operators.index_image= +intersmash.wildfly.operators.package_manifest=eap +intersmash.wildfly.operators.channel=stable +intersmash.wildfly.helm.charts.repo=https://github.com/jbossas/eap-charts.git +intersmash.wildfly.helm.charts.branch=eap-xp6-dev +intersmash.wildfly.helm.charts.name=eap-xp6 +intersmash.bootable.jar.image=registry.access.redhat.com/ubi8/openjdk-17 + +intersmash.eap7.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-openshift-rhel8:latest +intersmash.eap7.runtime.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-runtime-openshift-rhel8:latest +intersmash.eap7.templates.base.url=https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/ +intersmash.eap7.templates.path=templates/ + +intersmash.activemq.image=registry.redhat.io/amq7/amq-broker-rhel8:7.12 +intersmash.activemq.init.image=registry.redhat.io/amq7/amq-broker-init-rhel8:7.12 +intersmash.activemq.operators.catalog_source=redhat-operators +intersmash.activemq.operators.index_image= +intersmash.activemq.operators.package_manifest=amq-broker-rhel8 +intersmash.activemq.operators.channel=7.12.x + +intersmash.keycloak.image=registry.redhat.io/rhbk/keycloak-rhel9:26.0 +intersmash.keycloak.operators.index_image= +intersmash.keycloak.operators.catalog_source=redhat-operators +intersmash.keycloak.operators.channel=stable-v26.0 +intersmash.keycloak.operators.package_manifest=rhbk-operator + +intersmash.rhsso.image=registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:7.6 +intersmash.rhsso.operators.catalog_source=redhat-operators +intersmash.rhsso.operators.package_manifest=rhsso-operator +intersmash.rhsso.templates=https://raw.githubusercontent.com/jboss-container-images/redhat-sso-7-openshift-image/sso76-dev/templates/ + +intersmash.infinispan.image=registry.redhat.io/datagrid/datagrid-8-rhel9:1.5 +intersmash.infinispan.operators.catalog_source=redhat-operators +intersmash.infinispan.operators.package_manifest=datagrid +intersmash.infinispan.operators.channel=stable + +intersmash.kafka.operators.catalog_source=redhat-operators +intersmash.kafka.operators.package_manifest=amq-streams +intersmash.kafka.operators.channel=stable + +intersmash.hyperfoil.operators.catalog_source=community-operators +intersmash.hyperfoil.operators.package_manifest=hyperfoil-bundle + +intersmash.olm.operators.catalog_source=redhat-operators +intersmash.olm.operators.namespace=openshift-marketplace diff --git a/testsuite/integration-tests/openshift-global-test.properties b/testsuite/integration-tests/openshift-global-test.properties new file mode 100644 index 000000000..8133d59b9 --- /dev/null +++ b/testsuite/integration-tests/openshift-global-test.properties @@ -0,0 +1,60 @@ +xtf.waiting.timeout.cleanup=60000 +xtf.waiting.timeout=600000 + +# OpenShift logs +xtf.record.dir=log +xtf.record.before=true +xtf.record.always=false + +# Avoid starting multiple builds at once as it might cause that builds starts to hang +xtf.junit.prebuilder.synchronized=true + +# DB +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:2.1.0-jdk21 +intersmash.wildfly.runtime.image=quay.io/wildfly/wildfly-runtime:2.1.0-jdk21 +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 +intersmash.wildfly.operators.channel=alpha +intersmash.wildfly.helm.charts.repo=https://github.com/wildfly/wildfly-charts.git +intersmash.wildfly.helm.charts.branch=wildfly-2.4.0 +intersmash.wildfly.helm.charts.name=wildfly +intersmash.bootable.jar.image=registry.access.redhat.com/ubi8/openjdk-17 + +intersmash.eap7.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-openshift-rhel8:latest +intersmash.eap7.runtime.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-runtime-openshift-rhel8:latest +intersmash.eap7.templates.base.url=https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/ +intersmash.eap7.templates.path=templates/ + +intersmash.activemq.operators.catalog_source=intersmash-activemq-operator-index +intersmash.activemq.operators.index_image=quay.io/jbossqe-eap/intersmash-activemq-operator-index:1.2.9 +intersmash.activemq.operators.package_manifest=activemq-artemis-operator +intersmash.activemq.operators.channel=upstream + +intersmash.keycloak.image=quay.io/keycloak/keycloak:26.0 +intersmash.keycloak.operators.catalog_source=community-operators +intersmash.keycloak.operators.channel=fast +intersmash.keycloak.operators.package_manifest=keycloak-operator + +intersmash.rhsso.image=registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:7.6 +intersmash.rhsso.operators.catalog_source=redhat-operators +intersmash.rhsso.operators.package_manifest=rhsso-operator +intersmash.rhsso.templates=https://raw.githubusercontent.com/jboss-container-images/redhat-sso-7-openshift-image/sso76-dev/templates/ + +intersmash.infinispan.image= +intersmash.infinispan.operators.catalog_source=community-operators +intersmash.infinispan.operators.package_manifest=infinispan +intersmash.infinispan.operators.channel= + +intersmash.kafka.operators.catalog_source=community-operators +intersmash.kafka.operators.package_manifest=strimzi-kafka-operator +intersmash.kafka.operators.channel=stable + +intersmash.hyperfoil.operators.catalog_source=community-operators +intersmash.hyperfoil.operators.package_manifest=hyperfoil-bundle + +intersmash.olm.operators.catalog_source=community-operators +intersmash.olm.operators.namespace=openshift-marketplace diff --git a/testsuite/integration-tests/pom.xml b/testsuite/integration-tests/pom.xml index 42982a681..26b4a51bc 100644 --- a/testsuite/integration-tests/pom.xml +++ b/testsuite/integration-tests/pom.xml @@ -97,6 +97,9 @@ maven-surefire-plugin ${intersmash.test.excludedGroups.by.execution-profile},${intersmash.test.excludedGroups.by.wildfly-target-distribution},${intersmash.test.excludedGroups.by.target-platform} + + ${project.basedir}/openshift-global-test.properties + @@ -148,6 +151,78 @@ ts.k8s + + + ts.eap-stream.80 + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${intersmash.test.excludedGroups.by.execution-profile},${intersmash.test.excludedGroups.by.wildfly-target-distribution},${intersmash.test.excludedGroups.by.target-platform} + + ${project.basedir}/eap80-global-test.properties + + + + + + + + + ts.eap-stream.81 + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${intersmash.test.excludedGroups.by.execution-profile},${intersmash.test.excludedGroups.by.wildfly-target-distribution},${intersmash.test.excludedGroups.by.target-platform} + + ${project.basedir}/eap81-global-test.properties + + + + + + + + + ts.eapxp-stream.xp5 + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${intersmash.test.excludedGroups.by.execution-profile},${intersmash.test.excludedGroups.by.wildfly-target-distribution},${intersmash.test.excludedGroups.by.target-platform} + + ${project.basedir}/eapxp5-global-test.properties + + + + + + + + + ts.eapxp-stream.xp6 + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${intersmash.test.excludedGroups.by.execution-profile},${intersmash.test.excludedGroups.by.wildfly-target-distribution},${intersmash.test.excludedGroups.by.target-platform} + + ${project.basedir}/eapxp6-global-test.properties + + + + + + 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 4bb4b2627..2599d969b 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 @@ -59,6 +59,8 @@ import org.jboss.intersmash.util.openshift.WildflyOpenShiftUtils; import org.jboss.intersmash.util.tls.CertificatesUtils; import org.jboss.intersmash.util.wildfly.Eap7CliScriptBuilder; +import org.keycloak.k8s.v2alpha1.Keycloak; +import org.keycloak.k8s.v2alpha1.KeycloakBuilder; import org.keycloak.k8s.v2alpha1.keycloakspec.HostnameBuilder; import org.keycloak.k8s.v2alpha1.keycloakspec.HttpBuilder; import org.keycloak.k8s.v2alpha1.keycloakspec.IngressBuilder; @@ -343,6 +345,14 @@ public List getEnvVars() { (Strings.isNullOrEmpty(TestDeploymentProperties.getWildflyDeploymentsBuildProfile()) ? "" : " -Pts.wildfly.target-distribution." + TestDeploymentProperties.getWildflyDeploymentsBuildProfile())); + // let's pass the stream for building the deployment too... + final String deploymentStream = TestDeploymentProperties.getWildflyDeploymentsBuildStream(); + if (!TestDeploymentProperties.WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_COMMUNITY.equals(deploymentStream)) { + mavenAdditionalArgs = mavenAdditionalArgs.concat( + (Strings.isNullOrEmpty(deploymentStream) ? "" + : String.format(" -Pts.%s-stream.", getWildflyDeploymentVariantFromStream(deploymentStream)) + + getWildflyDeploymentVariantProfileNameFromStream(deploymentStream))); + } list.add(new EnvVarBuilder().withName("MAVEN_ARGS_APPEND").withValue(mavenAdditionalArgs).build()); list.add(new EnvVarBuilder().withName("MAVEN_S2I_ARTIFACT_DIRS").withValue(deploymentRelativePath + "target") .build()); @@ -406,6 +416,14 @@ public List getEnvVars() { (Strings.isNullOrEmpty(TestDeploymentProperties.getWildflyDeploymentsBuildProfile()) ? "" : " -Pts.wildfly.target-distribution." + TestDeploymentProperties.getWildflyDeploymentsBuildProfile())); + // let's pass the stream for building the deployment too... + final String deploymentStream = TestDeploymentProperties.getWildflyDeploymentsBuildStream(); + if (!TestDeploymentProperties.WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_COMMUNITY.equals(deploymentStream)) { + mavenAdditionalArgs = mavenAdditionalArgs.concat( + (Strings.isNullOrEmpty(deploymentStream) ? "" + : String.format(" -Pts.%s-stream.", getWildflyDeploymentVariantFromStream(deploymentStream)) + + getWildflyDeploymentVariantProfileNameFromStream(deploymentStream))); + } if (!Strings.isNullOrEmpty(mavenAdditionalArgs)) { list.add(new EnvVarBuilder().withName("MAVEN_ARGS_APPEND").withValue(mavenAdditionalArgs).build()); } @@ -724,7 +742,7 @@ static KeycloakOperatorApplication getKeycloakOperatorApplication() { final String DEFAULT_KEYCLOAK_APP_NAME = "example-sso"; return new KeycloakOperatorApplication() { @Override - public org.keycloak.k8s.v2alpha1.Keycloak getKeycloak() { + public Keycloak getKeycloak() { // create key, certificate and tls secret: Keycloak expects the secret to be created beforehand final String hostName = OpenShifts.master().generateHostname(DEFAULT_KEYCLOAK_APP_NAME); final String tlsSecretName = DEFAULT_KEYCLOAK_APP_NAME + "-tls-secret"; @@ -732,7 +750,7 @@ public org.keycloak.k8s.v2alpha1.Keycloak getKeycloak() { .generateSelfSignedCertificateAndKey(hostName.replaceFirst("[.].*$", ""), tlsSecretName, OpenShifts.master().getClient(), OpenShifts.master().getNamespace()); // build the basic Keycloak resource - return new org.keycloak.k8s.v2alpha1.KeycloakBuilder() + return new KeycloakBuilder() .withNewMetadata() .withName(DEFAULT_KEYCLOAK_APP_NAME) .withLabels(Map.of("app", getName())) diff --git a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java index 1a4f7cee7..639ee0749 100644 --- a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java +++ b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartExistingValuesOpenShiftExampleApplication.java @@ -25,11 +25,17 @@ import org.jboss.intersmash.application.openshift.helm.HelmChartRelease; import org.jboss.intersmash.application.openshift.helm.WildflyHelmChartOpenShiftApplication; import org.jboss.intersmash.model.helm.charts.values.eap8.HelmEap8Release; +import org.jboss.intersmash.model.helm.charts.values.eap81.HelmEap81Release; import org.jboss.intersmash.model.helm.charts.values.wildfly.HelmWildflyRelease; +import org.jboss.intersmash.model.helm.charts.values.xp5.HelmXp5Release; +import org.jboss.intersmash.model.helm.charts.values.xp6.HelmXp6Release; import org.jboss.intersmash.provision.helm.HelmChartReleaseAdapter; import org.jboss.intersmash.provision.helm.wildfly.WildFlyHelmChartReleaseAdapter; import org.jboss.intersmash.provision.helm.wildfly.WildflyHelmChartRelease; import org.jboss.intersmash.provision.helm.wildfly.eap8.Eap8HelmChartReleaseAdapter; +import org.jboss.intersmash.provision.helm.wildfly.eap81.Eap81HelmChartReleaseAdapter; +import org.jboss.intersmash.provision.helm.wildfly.xp5.EapXp5HelmChartReleaseAdapter; +import org.jboss.intersmash.provision.helm.wildfly.xp6.EapXp6HelmChartReleaseAdapter; import org.jboss.intersmash.test.deployments.TestDeploymentProperties; import org.jboss.intersmash.test.deployments.WildflyDeploymentApplicationConfiguration; import org.jboss.intersmash.testsuite.IntersmashTestsuiteProperties; @@ -66,13 +72,40 @@ private HelmChartRelease loadRelease() { .withJdk17BuilderImage(IntersmashConfig.wildflyImageURL()) .withJdk17RuntimeImage(IntersmashConfig.wildflyRuntimeImageURL()); } else if (IntersmashTestsuiteProperties.isProductizedTestExecutionProfileEnabled()) { - HelmEap8Release helmRelease = HelmChartReleaseAdapter. fromValuesFile( - this.getClass().getResource("eap8-helm-values.yaml"), HelmEap8Release.class); - wildflyHelmChartRelease = new Eap8HelmChartReleaseAdapter(helmRelease) - .withJdk17BuilderImage(IntersmashConfig.wildflyImageURL()) - .withJdk17RuntimeImage(IntersmashConfig.wildflyRuntimeImageURL()); + // EAP 8.0 + if (TestDeploymentProperties.isEap80DeploymentsBuildStreamEnabled()) { + HelmEap8Release helmRelease = HelmChartReleaseAdapter. fromValuesFile( + this.getClass().getResource("eap8-helm-values.yaml"), HelmEap8Release.class); + wildflyHelmChartRelease = new Eap8HelmChartReleaseAdapter(helmRelease) + .withJdk17BuilderImage(IntersmashConfig.wildflyImageURL()) + .withJdk17RuntimeImage(IntersmashConfig.wildflyRuntimeImageURL()); + } // EAP 8.1 + else if (TestDeploymentProperties.isEap81DeploymentsBuildStreamEnabled()) { + HelmEap81Release helmRelease = HelmChartReleaseAdapter. fromValuesFile( + this.getClass().getResource("eap81-helm-values.yaml"), HelmEap81Release.class); + wildflyHelmChartRelease = new Eap81HelmChartReleaseAdapter(helmRelease) + .withJdk17BuilderImage(IntersmashConfig.wildflyImageURL()) + .withJdk17RuntimeImage(IntersmashConfig.wildflyRuntimeImageURL()); + } // EAP XP 5 + else if (TestDeploymentProperties.isEapXp5DeploymentsBuildStreamEnabled()) { + HelmXp5Release helmRelease = HelmChartReleaseAdapter. fromValuesFile( + this.getClass().getResource("xp5-helm-values.yaml"), HelmXp5Release.class); + wildflyHelmChartRelease = new EapXp5HelmChartReleaseAdapter(helmRelease) + .withJdk17BuilderImage(IntersmashConfig.wildflyImageURL()) + .withJdk17RuntimeImage(IntersmashConfig.wildflyRuntimeImageURL()); + } // EAP XP 6 + else if (TestDeploymentProperties.isEapXp6DeploymentsBuildStreamEnabled()) { + HelmXp6Release helmRelease = HelmChartReleaseAdapter. fromValuesFile( + this.getClass().getResource("xp6-helm-values.yaml"), HelmXp6Release.class); + wildflyHelmChartRelease = new EapXp6HelmChartReleaseAdapter(helmRelease) + .withJdk17BuilderImage(IntersmashConfig.wildflyImageURL()) + .withJdk17RuntimeImage(IntersmashConfig.wildflyRuntimeImageURL()); + } else + throw new IllegalStateException(String.format("Not a valid WildFly deployments stream! (%s)", + TestDeploymentProperties.getWildflyDeploymentsBuildStream())); } else - throw new IllegalStateException("Not a valid testing profile!"); + throw new IllegalStateException(String.format("Not a valid testing profile! (%s)", + IntersmashTestsuiteProperties.getTestExecutionProfile())); // let's compute some additional maven args for our s2i build to happen on a Pod String mavenAdditionalArgs = "-Denforcer.skip=true"; // let's add configurable deployment additional args: @@ -82,6 +115,14 @@ private HelmChartRelease loadRelease() { (Strings.isNullOrEmpty(TestDeploymentProperties.getWildflyDeploymentsBuildProfile()) ? "" : " -Pts.wildfly.target-distribution." + TestDeploymentProperties.getWildflyDeploymentsBuildProfile())); + // let's pass the stream for building the deployment too... + final String deploymentStream = TestDeploymentProperties.getWildflyDeploymentsBuildStream(); + if (!TestDeploymentProperties.WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_COMMUNITY.equals(deploymentStream)) { + mavenAdditionalArgs = mavenAdditionalArgs.concat( + (Strings.isNullOrEmpty(deploymentStream) ? "" + : String.format(" -Pts.%s-stream.", getWildflyDeploymentVariantFromStream(deploymentStream)) + + getWildflyDeploymentVariantProfileNameFromStream(deploymentStream))); + } wildflyHelmChartRelease.setBuildEnvironmentVariables(Map.of("MAVEN_ARGS_APPEND", mavenAdditionalArgs)); return wildflyHelmChartRelease; } diff --git a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java index dfada0633..e1fadafc8 100644 --- a/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java +++ b/testsuite/integration-tests/src/test/java/org/jboss/intersmash/testsuite/provision/openshift/WildflyHelmChartOpenShiftExampleApplication.java @@ -25,10 +25,16 @@ import org.jboss.intersmash.application.openshift.helm.HelmChartRelease; import org.jboss.intersmash.application.openshift.helm.WildflyHelmChartOpenShiftApplication; import org.jboss.intersmash.model.helm.charts.values.eap8.HelmEap8Release; +import org.jboss.intersmash.model.helm.charts.values.eap81.HelmEap81Release; import org.jboss.intersmash.model.helm.charts.values.wildfly.HelmWildflyRelease; +import org.jboss.intersmash.model.helm.charts.values.xp5.HelmXp5Release; +import org.jboss.intersmash.model.helm.charts.values.xp6.HelmXp6Release; import org.jboss.intersmash.provision.helm.wildfly.WildFlyHelmChartReleaseAdapter; import org.jboss.intersmash.provision.helm.wildfly.WildflyHelmChartRelease; import org.jboss.intersmash.provision.helm.wildfly.eap8.Eap8HelmChartReleaseAdapter; +import org.jboss.intersmash.provision.helm.wildfly.eap81.Eap81HelmChartReleaseAdapter; +import org.jboss.intersmash.provision.helm.wildfly.xp5.EapXp5HelmChartReleaseAdapter; +import org.jboss.intersmash.provision.helm.wildfly.xp6.EapXp6HelmChartReleaseAdapter; import org.jboss.intersmash.test.deployments.TestDeploymentProperties; import org.jboss.intersmash.test.deployments.WildflyDeploymentApplicationConfiguration; import org.jboss.intersmash.testsuite.IntersmashTestsuiteProperties; @@ -45,9 +51,20 @@ public WildflyHelmChartOpenShiftExampleApplication() { if (IntersmashTestsuiteProperties.isCommunityTestExecutionProfileEnabled()) { release = loadRelease(new WildFlyHelmChartReleaseAdapter(new HelmWildflyRelease())); } else if (IntersmashTestsuiteProperties.isProductizedTestExecutionProfileEnabled()) { - release = loadRelease(new Eap8HelmChartReleaseAdapter(new HelmEap8Release())); + if (TestDeploymentProperties.isEap80DeploymentsBuildStreamEnabled()) { + release = loadRelease(new Eap8HelmChartReleaseAdapter(new HelmEap8Release())); + } else if (TestDeploymentProperties.isEap81DeploymentsBuildStreamEnabled()) { + release = loadRelease(new Eap81HelmChartReleaseAdapter(new HelmEap81Release())); + } else if (TestDeploymentProperties.isEapXp5DeploymentsBuildStreamEnabled()) { + release = loadRelease(new EapXp5HelmChartReleaseAdapter(new HelmXp5Release())); + } else if (TestDeploymentProperties.isEapXp6DeploymentsBuildStreamEnabled()) { + release = loadRelease(new EapXp6HelmChartReleaseAdapter(new HelmXp6Release())); + } else + throw new IllegalStateException(String.format("Not a valid WildFly deployments stream! (%s)", + TestDeploymentProperties.getWildflyDeploymentsBuildStream())); } else - throw new IllegalStateException("Not a valid testing profile!"); + throw new IllegalStateException(String.format("Not a valid testing profile! (%s)", + IntersmashTestsuiteProperties.getTestExecutionProfile())); } private HelmChartRelease loadRelease(final WildflyHelmChartRelease release) { @@ -60,9 +77,20 @@ private HelmChartRelease loadRelease(final WildflyHelmChartRelease release) { (Strings.isNullOrEmpty(TestDeploymentProperties.getWildflyDeploymentsBuildProfile()) ? "" : " -Pts.wildfly.target-distribution." + TestDeploymentProperties.getWildflyDeploymentsBuildProfile())); + // let's pass the stream for building the deployment too... + final String deploymentStream = TestDeploymentProperties.getWildflyDeploymentsBuildStream(); + if (!TestDeploymentProperties.WILDFLY_DEPLOYMENTS_BUILD_STREAM_VALUE_COMMUNITY.equals(deploymentStream)) { + mavenAdditionalArgs = mavenAdditionalArgs.concat( + (Strings.isNullOrEmpty(deploymentStream) ? "" + : String.format(" -Pts.%s-stream.", getWildflyDeploymentVariantFromStream(deploymentStream)) + + getWildflyDeploymentVariantProfileNameFromStream(deploymentStream))); + } // ok, let's configure the release via the WildflyHelmChartRelease fluent(-ish) API, // which offers a common reference for both WildFly and EAP (latest) release + // we explicitly set we need an s2i build, ot Bootable JAR, otherwise the OpenJDK image would be + // used since the Bootable JAR mode is the default. + .withBuildMode(WildflyHelmChartRelease.BuildMode.S2I) .withSourceRepositoryUrl(IntersmashConfig.deploymentsRepositoryUrl()) .withSourceRepositoryRef(IntersmashConfig.deploymentsRepositoryRef()) .withContextDir("testsuite/deployments/openshift-jakarta-sample-standalone") diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/intersmash/testsuite/provision/openshift/eap81-helm-values.yaml b/testsuite/integration-tests/src/test/resources/org/jboss/intersmash/testsuite/provision/openshift/eap81-helm-values.yaml new file mode 100644 index 000000000..89d65233c --- /dev/null +++ b/testsuite/integration-tests/src/test/resources/org/jboss/intersmash/testsuite/provision/openshift/eap81-helm-values.yaml @@ -0,0 +1,19 @@ +build: + enabled: true + mode: "s2i" + # uri and ref will be specified via Helm --set arguments + contextDir: "testsuite/deployments/openshift-jakarta-sample-standalone" + s2i: + kind: "DockerImage" + buildApplicationImage: true + # builderImage and runtimeImage will be specified via the WildFly Helm Chart application descriptor APIs +deploy: + enabled: true + replicas: 1 + env: [] + envFrom: [] + volumeMounts: [] + volumes: [] + initContainers: [] + extraContainers: [] + 'imagePullSecrets:': [] diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/intersmash/testsuite/provision/openshift/xp5-helm-values.yaml b/testsuite/integration-tests/src/test/resources/org/jboss/intersmash/testsuite/provision/openshift/xp5-helm-values.yaml new file mode 100644 index 000000000..89d65233c --- /dev/null +++ b/testsuite/integration-tests/src/test/resources/org/jboss/intersmash/testsuite/provision/openshift/xp5-helm-values.yaml @@ -0,0 +1,19 @@ +build: + enabled: true + mode: "s2i" + # uri and ref will be specified via Helm --set arguments + contextDir: "testsuite/deployments/openshift-jakarta-sample-standalone" + s2i: + kind: "DockerImage" + buildApplicationImage: true + # builderImage and runtimeImage will be specified via the WildFly Helm Chart application descriptor APIs +deploy: + enabled: true + replicas: 1 + env: [] + envFrom: [] + volumeMounts: [] + volumes: [] + initContainers: [] + extraContainers: [] + 'imagePullSecrets:': [] diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/intersmash/testsuite/provision/openshift/xp6-helm-values.yaml b/testsuite/integration-tests/src/test/resources/org/jboss/intersmash/testsuite/provision/openshift/xp6-helm-values.yaml new file mode 100644 index 000000000..89d65233c --- /dev/null +++ b/testsuite/integration-tests/src/test/resources/org/jboss/intersmash/testsuite/provision/openshift/xp6-helm-values.yaml @@ -0,0 +1,19 @@ +build: + enabled: true + mode: "s2i" + # uri and ref will be specified via Helm --set arguments + contextDir: "testsuite/deployments/openshift-jakarta-sample-standalone" + s2i: + kind: "DockerImage" + buildApplicationImage: true + # builderImage and runtimeImage will be specified via the WildFly Helm Chart application descriptor APIs +deploy: + enabled: true + replicas: 1 + env: [] + envFrom: [] + volumeMounts: [] + volumes: [] + initContainers: [] + extraContainers: [] + 'imagePullSecrets:': []