From e95348dc0d23aa1fdd5790914e046134bb33fcba Mon Sep 17 00:00:00 2001 From: Jean Francois Denise Date: Thu, 4 Apr 2024 10:56:44 +0200 Subject: [PATCH 1/2] Use WildFly Maven Plugin 5.0.0.Beta4 in builder image --- wildfly-builder-image/image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml index 12372a1d..f96b1218 100644 --- a/wildfly-builder-image/image.yaml +++ b/wildfly-builder-image/image.yaml @@ -35,7 +35,7 @@ envs: - name: PROVISIONING_MAVEN_PLUGIN_ARTIFACT_ID value: wildfly-maven-plugin - name: PROVISIONING_MAVEN_PLUGIN_VERSION - value: 4.2.0.Final + value: 5.0.0.Beta4 ports: - value: 8080 modules: From a5d619222e494c148559a8f338dfd015c103e0c0 Mon Sep 17 00:00:00 2001 From: Jean Francois Denise Date: Thu, 4 Apr 2024 10:57:14 +0200 Subject: [PATCH 2/2] Upgrade test features to WildFly 31.0.1.Final --- .../tests/features/legacy-elytron.feature | 2 +- .../tests/features/legacy-s2i.feature | 18 +++++++++--------- .../tests/features/messaging.feature | 2 +- .../tests/features/oidc.feature | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wildfly-builder-image/tests/features/legacy-elytron.feature b/wildfly-builder-image/tests/features/legacy-elytron.feature index 4988fd1f..67ccb14a 100644 --- a/wildfly-builder-image/tests/features/legacy-elytron.feature +++ b/wildfly-builder-image/tests/features/legacy-elytron.feature @@ -5,7 +5,7 @@ Scenario: Build elytron app Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app-web-security with env and true using legacy-s2i-images-ee-10-test-apps | variable | value | | GALLEON_PROVISION_LAYERS | datasources-web-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | Then container log should contain WFLYSRV0025 Scenario: check Elytron configuration with elytron core realms security domain fail diff --git a/wildfly-builder-image/tests/features/legacy-s2i.feature b/wildfly-builder-image/tests/features/legacy-s2i.feature index 233f2ee7..ea70a2e2 100644 --- a/wildfly-builder-image/tests/features/legacy-s2i.feature +++ b/wildfly-builder-image/tests/features/legacy-s2i.feature @@ -16,7 +16,7 @@ Scenario: Test preconfigure.sh | variable | value | | TEST_EXTENSION_PRE_ADD_PROPERTY | foo | | GALLEON_PROVISION_LAYERS | cloud-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | Then container log should contain WFLYSRV0025 And container log should contain WFLYSRV0010: Deployed "ROOT.war" And check that page is served @@ -31,12 +31,12 @@ Scenario: Test preconfigure.sh Given failing s2i build http://github.com/openshift/openshift-jee-sample from . using master | variable | value | | GALLEON_PROVISION_LAYERS | foo | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | Scenario: Test default cloud config Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and True using legacy-s2i-images | variable | value | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | | GALLEON_PROVISION_LAYERS | cloud-default-config | Then container log should contain WFLYSRV0025 And container log should contain WFLYSRV0010: Deployed "ROOT.war" @@ -48,7 +48,7 @@ Scenario: Test preconfigure.sh Scenario: Test cloud-server, exclude jaxrs Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and True using legacy-s2i-images | variable | value | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | | GALLEON_PROVISION_LAYERS | cloud-server,-jaxrs | Then container log should contain WFLYSRV0025 And check that page is served @@ -62,7 +62,7 @@ Scenario: Test preconfigure.sh Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and True using legacy-s2i-images | variable | value | | GALLEON_PROVISION_LAYERS | cloud-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-preview-feature-pack:31.0.0.Beta1, org.wildfly.cloud:wildfly-preview-cloud-galleon-pack:5.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-preview-feature-pack:31.0.1.Final, org.wildfly.cloud:wildfly-preview-cloud-galleon-pack:5.0.2.Final | Then container log should contain WFLYSRV0025 And container log should contain WFLYSRV0010: Deployed "ROOT.war" And check that page is served @@ -75,7 +75,7 @@ Scenario: Test external driver created during s2i. | variable | value | | ENV_FILES | /opt/server/standalone/configuration/datasources.env | | GALLEON_PROVISION_LAYERS | cloud-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | Then container log should contain WFLYSRV0025 And check that page is served | property | value | @@ -90,7 +90,7 @@ Scenario: Test external driver created during s2i. | ENV_FILES | /opt/server/standalone/configuration/datasources.env | | DISABLE_BOOT_SCRIPT_INVOKER | true | | GALLEON_PROVISION_LAYERS | cloud-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | Then container log should contain Configuring the server using embedded server Then container log should contain WFLYSRV0025 And check that page is served @@ -104,7 +104,7 @@ Scenario: Test external driver created during s2i. Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app-binary with env and True using legacy-s2i-images | variable | value | | GALLEON_PROVISION_LAYERS | jaxrs-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | Then container log should contain WFLYSRV0025 And container log should contain WFLYSRV0010: Deployed "app.war" And check that page is served @@ -117,7 +117,7 @@ Scenario: Test external driver created during s2i. | variable | value | | MAVEN_S2I_ARTIFACT_DIRS | app1/target,app2/target | | GALLEON_PROVISION_LAYERS | cloud-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | ### PLACEHOLDER FOR CLOUD CUSTOM TESTING ### Then container log should contain WFLYSRV0010: Deployed "App1.war" Then container log should contain WFLYSRV0010: Deployed "App2.war" diff --git a/wildfly-builder-image/tests/features/messaging.feature b/wildfly-builder-image/tests/features/messaging.feature index 56d3c050..6d378934 100644 --- a/wildfly-builder-image/tests/features/messaging.feature +++ b/wildfly-builder-image/tests/features/messaging.feature @@ -5,7 +5,7 @@ Scenario: Configure amq7 remote broker Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and true using legacy-s2i-images | variable | value | | GALLEON_PROVISION_LAYERS | cloud-server | - | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:31.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | | MQ_SERVICE_PREFIX_MAPPING | wf-app-amq7=TEST | | WF_APP_AMQ_TCP_SERVICE_HOST | 127.0.0.1 | | WF_APP_AMQ_TCP_SERVICE_PORT | 5678 | diff --git a/wildfly-builder-image/tests/features/oidc.feature b/wildfly-builder-image/tests/features/oidc.feature index 11fce3be..a81feb0c 100644 --- a/wildfly-builder-image/tests/features/oidc.feature +++ b/wildfly-builder-image/tests/features/oidc.feature @@ -24,7 +24,7 @@ Feature: OIDC tests Given s2i build http://github.com/wildfly/wildfly-s2i from test/test-app-elytron-oidc-client-legacy with env and True using main | variable | value | | GALLEON_PROVISION_LAYERS | cloud-server,elytron-oidc-client | - | GALLEON_PROVISION_FEATURE_PACKS|org.wildfly:wildfly-galleon-pack:31.0.0.Beta1,org.wildfly.cloud:wildfly-cloud-galleon-pack:5.0.2.Final | + | GALLEON_PROVISION_FEATURE_PACKS|org.wildfly:wildfly-galleon-pack:31.0.1.Final,org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | Scenario: Check oidc subsystem configuration, legacy. Given XML namespaces | prefix | url |