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

POC Auto upgrade plugin2 #496

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

POC Auto upgrade plugin2 #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions wildfly-builder-image/image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ envs:
value: org.wildfly.plugins
- name: PROVISIONING_MAVEN_PLUGIN_ARTIFACT_ID
value: wildfly-maven-plugin
- name: PROVISIONING_MAVEN_PLUGIN_VERSION
value: 5.0.1.Final
- name: DEFAULT_PROVISIONING_MAVEN_PLUGIN_VERSION
value: 5.0.0.Final
- name: PROVISIONING_MAVEN_PLUGIN_VERSION_EXCLUDES
value: .*-redhat-[0-9][0-9][0-9][0-9][0-9],.*\.Beta\d+,.*\.Alpha\d+
ports:
- value: 8080
modules:
Expand All @@ -46,8 +48,8 @@ modules:
ref: ubi9
- name: wildfly-cekit-modules
git:
url: https://github.com/wildfly/wildfly-cekit-modules
ref: main
url: https://github.com/jfdenise/wildfly-cekit-modules
ref: patch_wfmp_version2
- name: wildfly-modules
path: ../wildfly-modules
install:
Expand Down
20 changes: 19 additions & 1 deletion wildfly-builder-image/tests/features/legacy-s2i.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,22 @@ Scenario: Test external driver created during s2i.
### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
Then container log should contain WFLYSRV0010: Deployed "App1.war"
Then container log should contain WFLYSRV0010: Deployed "App2.war"
Then container log should contain WFLYSRV0025
Then container log should contain WFLYSRV0025

Scenario: Test WildFly Maven Plugin version automatic update
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 |
jfdenise marked this conversation as resolved.
Show resolved Hide resolved
| GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
Then s2i build log should match regex wildfly-maven-plugin:.*\.Final:package
Then s2i build log should match regex Updated \$\{version.s2i.provisioning.maven.plugin\} from .*\.Final to .*\.Final
Then container log should contain WFLYSRV0025

Scenario: Test WildFly Maven Plugin version explicitly set
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 |
| PROVISIONING_MAVEN_PLUGIN_VERSION | 5.0.0.Final |
Then s2i build log should contain wildfly-maven-plugin:5.0.0.Final:package
Then container log should contain WFLYSRV0025
Loading