Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support latest WildFly(35.0.0.Final)/EAP(8.1 & XP 6) #225

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Support latest WildFly(35.0.0.Final)/EAP(8.1 & XP 6) #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a97d4bf
[issue-222] - Add EAP XP 6 and EAP 8.1 Helm Charts values schema file…
fabiobrz Jan 11, 2025
59e50c8
[issue 222] - Update documentation and global-test.properties file
fabiobrz Jan 14, 2025
6475ddf
[issue-222] - Bumping WildFly and related artifacts to latest
fabiobrz Jan 14, 2025
c10393f
[issue-222] (Unrelated) - Yet another update of documentation about l…
fabiobrz Jan 14, 2025
7548a0b
[issue-222] - Add profiles for building EAP XP 5 and EAP XP 6 deploym…
fabiobrz Jan 15, 2025
e189699
[issue-222] (TEMP) - Fix XP 6 schema file
fabiobrz Jan 16, 2025
724d46a
[issue-222] - Add EAP XP 6 and EAP 8.1 cases to Helm Charts integrati…
fabiobrz Jan 16, 2025
0f345e6
[issue-222] - Update documentation about testsuite profiles
fabiobrz Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 38 additions & 22 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.eap80`,
or the `ts.eap-stream.eap81` profile, e.g.:

```shell
mvn test -pl testsuite/ -Pts.execution-profile.prod -Pts.wildfly.target-distribution.eap -Pts.eap-stream.eap80
```

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
Expand Down
6 changes: 3 additions & 3 deletions examples/wildfly-keycloak-saml-adapter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>32.0.0.Final</version.wildfly-server>
<version.wildfly-server>35.0.0.Final</version.wildfly-server>
<!-- WildFly Maven Plugin version -->
<wildfly-maven-plugin.version>5.0.0.Final</wildfly-maven-plugin.version>
<wildfly-maven-plugin.version>5.1.1.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>
<!--
Expand All @@ -35,7 +35,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:6.0.0.Final</wildfly.cloud-feature-pack.location>
<wildfly.cloud-feature-pack.location>org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final</wildfly.cloud-feature-pack.location>

<!-- Keycloak SAML -->
<keycloak-saml-adapter-galleon-pack.groupId>org.keycloak</keycloak-saml-adapter-galleon-pack.groupId>
Expand Down
6 changes: 3 additions & 3 deletions examples/ws-bootable-jar-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@

<version.microprofile-config-api>1.3</version.microprofile-config-api>

<wildfly-maven-plugin.version>4.0.0.Final</wildfly-maven-plugin.version>
<wildfly-maven-plugin.version>5.1.1.Final</wildfly-maven-plugin.version>
<version.maven-war-plugin>3.3.2</version.maven-war-plugin>
<!--
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>12.0.0.Beta1</version.wildfly-jar-maven-plugin>

<version.wildfly.feature-pack>29.0.1.Final</version.wildfly.feature-pack>
<version.wildfly.feature-pack>35.0.0.Final</version.wildfly.feature-pack>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion examples/wstrust/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
<version.wildfly-jar-maven-plugin>10.0.0.Final</version.wildfly-jar-maven-plugin>
<version.wildfly-jar-maven-plugin>12.0.0.Beta1</version.wildfly-jar-maven-plugin>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion examples/wstrust/service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</formatting-style-base-directory>
<version.maven-war-plugin>3.3.2</version.maven-war-plugin>

<version.wildfly.feature-pack>29.0.1.Final</version.wildfly.feature-pack>
<version.wildfly.feature-pack>35.0.0.Final</version.wildfly.feature-pack>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion examples/wstrust/sts/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</formatting-style-base-directory>
<version.maven-war-plugin>3.3.2</version.maven-war-plugin>

<version.wildfly.feature-pack>29.0.1.Final</version.wildfly.feature-pack>
<version.wildfly.feature-pack>35.0.0.Final</version.wildfly.feature-pack>
</properties>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions global-test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ 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: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.activemq.operators.catalog_source=intersmash-activemq-operator-index
Expand Down
29 changes: 28 additions & 1 deletion provisioners/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
<goal>generate</goal>
</goals>
<configuration>
<!-- WildFly Helm Chart model is generated from JSON schema at https://github.com/wildfly/wildfly-charts/blob/wildfly-2.3.2/charts/wildfly/values.schema.json -->
<!-- WildFly Helm Chart model is generated from JSON schema at https://github.com/wildfly/wildfly-charts/blob/wildfly-2.4.0/charts/wildfly/values.schema.json -->
<sourceDirectory>${basedir}/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/wildfly</sourceDirectory>
<outputDirectory>target/generated-sources</outputDirectory>
<targetPackage>org.jboss.intersmash.model.helm.charts.values.wildfly</targetPackage>
Expand All @@ -289,6 +289,20 @@
<targetPackage>org.jboss.intersmash.model.helm.charts.values.eap8</targetPackage>
</configuration>
</execution>

<execution>
<id>charts.values.generate-schema-model.eap81</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<!-- JBoss EAP 8 Helm Chart model is generated from JSON schema at https://github.com/jbossas/eap-charts/blob/eap81-dev/charts/eap81/values.schema.json -->
<sourceDirectory>${basedir}/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/eap81</sourceDirectory>
<outputDirectory>${project.build.directory}/generated-sources/</outputDirectory>
<targetPackage>org.jboss.intersmash.model.helm.charts.values.eap81</targetPackage>
</configuration>
</execution>

<execution>
<id>charts.values.generate-schema-model.xp5</id>
<goals>
Expand All @@ -302,6 +316,19 @@
</configuration>
</execution>

<execution>
<id>charts.values.generate-schema-model.xp6</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<!-- JBoss EAP XP 6 Helm Chart model is generated from JSON schema at https://github.com/jbossas/eap-charts/eap-xp6-dev/charts/eap-xp6/values.schema.json -->
<sourceDirectory>${basedir}/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/xp6</sourceDirectory>
<outputDirectory>${project.build.directory}/generated-sources/</outputDirectory>
<targetPackage>org.jboss.intersmash.model.helm.charts.values.xp6</targetPackage>
</configuration>
</execution>

</executions>
</plugin>
<!--
Expand Down
Loading
Loading