Skip to content

Commit

Permalink
Merge pull request #499 from jfdenise/behave-34.0.1.Final
Browse files Browse the repository at this point in the history
Upgrade Behave features to 34.0.1.final and WFMP in the builder image to 5.1.0.Alpha2
  • Loading branch information
jfdenise authored Nov 28, 2024
2 parents 97728b6 + c95ed0e commit c943089
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion wildfly-builder-image/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ envs:
- name: PROVISIONING_MAVEN_PLUGIN_ARTIFACT_ID
value: wildfly-maven-plugin
- name: PROVISIONING_MAVEN_PLUGIN_VERSION
value: 5.0.1.Final
value: 5.1.0.Alpha2
ports:
- value: 8080
modules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
Then container log should contain WFLYSRV0025

Scenario: check Elytron configuration with elytron core realms security domain fail
Expand Down
16 changes: 8 additions & 8 deletions wildfly-builder-image/tests/features/legacy-s2i.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
Then container log should contain WFLYSRV0025
And container log should contain WFLYSRV0010: Deployed "ROOT.war"
And check that page is served
Expand All @@ -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:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.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:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_LAYERS | cloud-default-config |
Then container log should contain WFLYSRV0025
And container log should contain WFLYSRV0010: Deployed "ROOT.war"
Expand All @@ -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:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_LAYERS | cloud-server,-jaxrs |
Then container log should contain WFLYSRV0025
And check that page is served
Expand All @@ -63,7 +63,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:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
Then container log should contain WFLYSRV0025
And check that page is served
| property | value |
Expand All @@ -78,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:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
Then container log should contain Configuring the server using embedded server
Then container log should contain WFLYSRV0025
And check that page is served
Expand All @@ -92,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:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
Then container log should contain WFLYSRV0025
And container log should contain WFLYSRV0010: Deployed "app.war"
And check that page is served
Expand All @@ -105,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:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
Then container log should contain WFLYSRV0010: Deployed "App1.war"
Then container log should contain WFLYSRV0010: Deployed "App2.war"
Expand Down
2 changes: 1 addition & 1 deletion wildfly-builder-image/tests/features/messaging.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.1.Final, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.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 |
Expand Down
2 changes: 1 addition & 1 deletion wildfly-builder-image/tests/features/no-jdk11.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Feature: Wildfly Legacy s2i tests that can't run on JDK11
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:34.0.0.Beta1, org.wildfly.cloud:wildfly-preview-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-preview-feature-pack:34.0.1.Final, org.wildfly.cloud:wildfly-preview-cloud-galleon-pack:7.0.2.Final |
Then container log should contain WFLYSRV0025
And container log should contain WFLYSRV0010: Deployed "ROOT.war"
And check that page is served
Expand Down
2 changes: 1 addition & 1 deletion wildfly-builder-image/tests/features/oidc.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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:34.0.0.Beta1,org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
| GALLEON_PROVISION_FEATURE_PACKS|org.wildfly:wildfly-galleon-pack:34.0.1.Final,org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
Scenario: Check oidc subsystem configuration, legacy.
Given XML namespaces
| prefix | url |
Expand Down

0 comments on commit c943089

Please sign in to comment.