From 9f875ca398b884aa790a6a1d93672932e76cc21e Mon Sep 17 00:00:00 2001 From: Jean Francois Denise Date: Fri, 12 Apr 2024 10:27:42 +0200 Subject: [PATCH 1/3] behave features upgrade to WildFly 32.0.0.Beta1 --- .github/workflows/main.yml | 11 +++++++- .../tests/features/legacy-elytron.feature | 2 +- .../tests/features/legacy-s2i.feature | 28 ++++++------------- .../tests/features/messaging.feature | 2 +- .../features/no-jdk11-legacy-s2i.feature | 14 ++++++++++ .../tests/features/oidc.feature | 2 +- 6 files changed, 35 insertions(+), 24 deletions(-) create mode 100644 wildfly-builder-image/tests/features/no-jdk11-legacy-s2i.feature diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 77db0e8a..69843d5f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -109,7 +109,16 @@ jobs: docker image ls docker inspect ${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} docker run --rm ${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} bash - - name: Behave Tests + - name: Behave Tests JDK11, must remove tests that can't run on Java 11 + if: matrix.jdk == '11' + run: | + . ~/cekit/bin/activate + pushd wildfly-builder-image + rm -rf tests/features/no-jdk11-* + cekit -v test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave + popd + - name: Behave Tests JDK + if: matrix.jdk != '11' run: | . ~/cekit/bin/activate pushd wildfly-builder-image diff --git a/wildfly-builder-image/tests/features/legacy-elytron.feature b/wildfly-builder-image/tests/features/legacy-elytron.feature index 67ccb14a..32f82441 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.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:32.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.0.Beta2 | 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 ea70a2e2..eb716f96 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.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:32.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.0.Beta2 | 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.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:32.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.0.Beta2 | 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.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:32.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.0.Beta2 | | 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.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:32.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.0.Beta2 | | GALLEON_PROVISION_LAYERS | cloud-server,-jaxrs | Then container log should contain WFLYSRV0025 And check that page is served @@ -58,24 +58,12 @@ Scenario: Test preconfigure.sh Then XML file /opt/server/.galleon/provisioning.xml should contain value cloud-server on XPath //*[local-name()='installation']/*[local-name()='config']/*[local-name()='layers']/*[local-name()='include']/@name Then XML file /opt/server/.galleon/provisioning.xml should contain value jaxrs on XPath //*[local-name()='installation']/*[local-name()='config']/*[local-name()='layers']/*[local-name()='exclude']/@name - Scenario: Test preview FP and preview cloud FP with legacy app. - 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.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 - | property | value | - | path | / | - | port | 8080 | - Scenario: Test external driver created during s2i. Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app-custom with env and true using legacy-s2i-images | 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.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:32.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.0.Beta2 | Then container log should contain WFLYSRV0025 And check that page is served | property | value | @@ -90,7 +78,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.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:32.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.0.Beta2 | 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 +92,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.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:32.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.0.Beta2 | Then container log should contain WFLYSRV0025 And container log should contain WFLYSRV0010: Deployed "app.war" And check that page is served @@ -117,7 +105,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.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:32.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.0.Beta2 | ### 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 6d378934..1a5b0083 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.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | + | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:32.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.0.Beta2 | | 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/no-jdk11-legacy-s2i.feature b/wildfly-builder-image/tests/features/no-jdk11-legacy-s2i.feature new file mode 100644 index 00000000..19b0adde --- /dev/null +++ b/wildfly-builder-image/tests/features/no-jdk11-legacy-s2i.feature @@ -0,0 +1,14 @@ +@wildfly/wildfly-s2i +Feature: Wildfly Legacy s2i tests that can't run on JDK11 + + Scenario: Test preview FP and preview cloud FP with legacy app. + 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:32.0.0.Beta1, org.wildfly.cloud:wildfly-preview-cloud-galleon-pack:7.0.0.Beta2 | + Then container log should contain WFLYSRV0025 + And container log should contain WFLYSRV0010: Deployed "ROOT.war" + And check that page is served + | property | value | + | path | / | + | port | 8080 | diff --git a/wildfly-builder-image/tests/features/oidc.feature b/wildfly-builder-image/tests/features/oidc.feature index a81feb0c..22b0f5a5 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.1.Final,org.wildfly.cloud:wildfly-cloud-galleon-pack:6.0.0.Final | + | GALLEON_PROVISION_FEATURE_PACKS|org.wildfly:wildfly-galleon-pack:32.0.0.Beta1,org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.0.Beta2 | Scenario: Check oidc subsystem configuration, legacy. Given XML namespaces | prefix | url | From aaa772e8ba6a08769ce922ccec39d6c9a4683812 Mon Sep 17 00:00:00 2001 From: Jean Francois Denise Date: Fri, 12 Apr 2024 12:02:39 +0200 Subject: [PATCH 2/3] Fix ci workflow --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69843d5f..186e15e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -110,19 +110,19 @@ jobs: docker inspect ${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} docker run --rm ${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} bash - name: Behave Tests JDK11, must remove tests that can't run on Java 11 - if: matrix.jdk == '11' + if: matrix.jdk == 'jdk11' run: | . ~/cekit/bin/activate pushd wildfly-builder-image rm -rf tests/features/no-jdk11-* - cekit -v test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave popd - name: Behave Tests JDK - if: matrix.jdk != '11' + if: matrix.jdk != 'jdk11' run: | . ~/cekit/bin/activate pushd wildfly-builder-image - cekit -v test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave + cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave popd - name: Additional Tests run: | From 170a53f4224518ed79cb9b17c366ba551f50439c Mon Sep 17 00:00:00 2001 From: Jean Francois Denise Date: Fri, 12 Apr 2024 09:29:30 +0200 Subject: [PATCH 3/3] Upgrade to WildFly Maven Plugin 5.0.0.Final --- 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 f96b1218..fc3cda17 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: 5.0.0.Beta4 + value: 5.0.0.Final ports: - value: 8080 modules: