Merge pull request #362 from jfdenise/multi-deployment-behave-features

Multi deployment behave features
wildfly · Aug 3, 2022 · 0948f29 · 0948f29
2 parents 3399117 + 1817049
commit 0948f29
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 2 deletions.
diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml
@@ -48,7 +48,7 @@ modules:
           - name: openjdk
             git:
               url: https://github.com/jboss-container-images/openjdk
-              ref: develop
+              ref: wildfly-container-1.1.0
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules

diff --git a/wildfly-builder-image/tests/features/legacy-s2i.feature b/wildfly-builder-image/tests/features/legacy-s2i.feature
@@ -115,3 +115,14 @@ Scenario: Test external driver created during s2i.
       | property | value |
       | path     | /app     |
       | port     | 8080  |
+
+  Scenario: Multiple deployments legacy
+   Given s2i build http://github.com/wildfly/wildfly-s2i from test/test-app-multi-deployments-legacy with env and True using main
+   | variable                 | value           |
+   | MAVEN_S2I_ARTIFACT_DIRS | app1/target,app2/target |
+   | GALLEON_PROVISION_LAYERS | cloud-server |
+   | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:27.0.0.Alpha2, org.wildfly.cloud:wildfly-cloud-galleon-pack:2.0.0.Alpha2 |
+   ### 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
diff --git a/wildfly-builder-image/tests/features/s2i.feature b/wildfly-builder-image/tests/features/s2i.feature
@@ -127,3 +127,36 @@ Feature: Wildfly s2i tests
     Given failing s2i build https://github.com/wildfly/wildfly-s2i from test/test-app-invalid using main
     | variable                             | value         |
     ### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
+
+  Scenario: Multiple deployments via deployments directory
+   Given s2i build http://github.com/wildfly/wildfly-s2i from test/test-app-multi-deployments with env and True using main
+   | variable                 | value           |
+   | MAVEN_S2I_ARTIFACT_DIRS | server/target |
+   ### 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
+
+  Scenario: Multiple deployments
+   Given s2i build http://github.com/wildfly/wildfly-s2i from test/test-app-multi-deployments2 with env and True using main
+   | variable                 | value           |
+   | MAVEN_S2I_ARTIFACT_DIRS | server/target,app1/target,app2/target |
+   ### 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
+
+  Scenario: Failing Multiple deployments
+   Given failing s2i build http://github.com/wildfly/wildfly-s2i from test/test-app-multi-deployments-invalid using main
+   | variable                 | value           |
+   | MAVEN_S2I_ARTIFACT_DIRS | server/target,app1/target,app2/target |
+   ### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
+
+  Scenario: Multiple deployments from both MAVEN_S2I_ARTIFACT_DIRS and deployments dir
+   Given s2i build http://github.com/wildfly/wildfly-s2i from test/test-app-multi-deployments3 with env and True using main
+   | variable                 | value           |
+   | MAVEN_S2I_ARTIFACT_DIRS | server/target,app2/target |
+   ### 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
diff --git a/wildfly-runtime-image/image.yaml b/wildfly-runtime-image/image.yaml
@@ -34,7 +34,7 @@ modules:
           - name: openjdk
             git:
               url: https://github.com/jboss-container-images/openjdk
-              ref: develop
+              ref: wildfly-container-1.1.0
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules