Skip to content

Commit df95fb2

Browse files
jfdenisejfdenise
committed
Use channel 8.1 in tests
1 parent 5d7a671 commit df95fb2

File tree

30 files changed

+41
-40
lines changed

30 files changed

+41
-40
lines changed

‎builder-image/tests/features/datasources.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: EAP configured for datasources
55
Scenario: Build image with server and datasource
66
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-postgres with env and true using eap8-dev
77
| variable | value |
8-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
8+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
99
| GALLEON_USE_LOCAL_FILE | true |
1010
| POSTGRESQL_DRIVER_VERSION | 42.2.19 |
1111
### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
@@ -14,7 +14,7 @@ Scenario: Build image with server and datasource
1414
Scenario: Build image with server and datasources
1515
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-postgresql-oracle-legacy with env and true using eap8-dev
1616
| variable | value |
17-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
17+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
1818
| GALLEON_USE_LOCAL_FILE | true |
1919
| POSTGRESQL_DRIVER_VERSION | 42.2.19 |
2020
| ORACLE_DRIVER_VERSION | 19.3.0.0|

‎builder-image/tests/features/legacy-elytron.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Scenario: Build elytron app
66
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
77
| variable | value |
88
| GALLEON_PROVISION_LAYERS | datasources-web-server |
9-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
9+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
1010
| GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack |
1111
Then container log should contain WFLYSRV0025
1212

‎builder-image/tests/features/legacy-s2i.feature‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: EAP Legacy s2i tests
55
Scenario: Test provisioning.xml file
66
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/vanilla-eap/test-app-local-provisioning with env and True using eap8-dev
77
| variable | value |
8-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
8+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
99
| GALLEON_USE_LOCAL_FILE | true |
1010
Then container log should contain WFLYSRV0025
1111
And check that page is served
@@ -17,7 +17,7 @@ Scenario: Test preconfigure.sh
1717
Given s2i build https://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-advanced-extensions with env and True using master
1818
| variable | value |
1919
| TEST_EXTENSION_PRE_ADD_PROPERTY | foo |
20-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
20+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
2121
| GALLEON_PROVISION_LAYERS | cloud-server |
2222
| GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack |
2323
Then exactly 2 times container log should contain WFLYSRV0025:
@@ -32,14 +32,14 @@ Scenario: Test preconfigure.sh
3232
Scenario: Test invalid layer
3333
Given failing s2i build http://github.com/openshift/openshift-jee-sample from . using master
3434
| variable | value |
35-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
35+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
3636
| GALLEON_PROVISION_LAYERS | foo |
3737
| GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack |
3838

3939
Scenario: Test default cloud config
4040
Given s2i build https://github.com/openshift/openshift-jee-sample from . with env and True using master
4141
| variable | value |
42-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
42+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
4343
| GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack|
4444
| GALLEON_PROVISION_LAYERS | cloud-default-config |
4545
Then exactly 2 times container log should contain WFLYSRV0025
@@ -52,7 +52,7 @@ Scenario: Test preconfigure.sh
5252
Scenario: Test cloud-server, exclude jaxrs
5353
Given s2i build https://github.com/openshift/openshift-jee-sample from . with env and True using master
5454
| variable | value |
55-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
55+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
5656
| GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack |
5757
| GALLEON_PROVISION_LAYERS | cloud-server,-jaxrs |
5858
Then exactly 2 times container log should contain WFLYSRV0025:
@@ -66,7 +66,7 @@ Scenario: Test preconfigure.sh
6666
Scenario: Test preview FP and preview cloud FP with legacy app.
6767
Given s2i build https://github.com/openshift/openshift-jee-sample from . with env and True using master
6868
| variable | value |
69-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
69+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
7070
| GALLEON_PROVISION_LAYERS | cloud-server |
7171
| GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack|
7272
Then exactly 2 times container log should contain WFLYSRV0025:
@@ -80,7 +80,7 @@ Scenario: Test external driver created during s2i.
8080
Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app-custom with env and true using legacy-s2i-images
8181
| variable | value |
8282
| ENV_FILES | /opt/server/standalone/configuration/datasources.env |
83-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
83+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
8484
| GALLEON_PROVISION_LAYERS | cloud-server |
8585
| GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack |
8686
Then exactly 2 times container log should contain WFLYSRV0025:
@@ -96,7 +96,7 @@ Scenario: Test external driver created during s2i.
9696
| variable | value |
9797
| ENV_FILES | /opt/server/standalone/configuration/datasources.env |
9898
| DISABLE_BOOT_SCRIPT_INVOKER | true |
99-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
99+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
100100
| GALLEON_PROVISION_LAYERS | cloud-server |
101101
| GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack |
102102
Then container log should contain Configuring the server using embedded server
@@ -111,7 +111,7 @@ Scenario: Test external driver created during s2i.
111111
Scenario: Test legacy binary build
112112
Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app-binary with env and True using legacy-s2i-images
113113
| variable | value |
114-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
114+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
115115
| GALLEON_PROVISION_LAYERS | cloud-server |
116116
| GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack |
117117
Then container log should contain WFLYSRV0025
@@ -125,7 +125,7 @@ Scenario: Test external driver created during s2i.
125125
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-multi-deployments-legacy with env and True using eap8-dev
126126
| variable | value |
127127
| MAVEN_S2I_ARTIFACT_DIRS | app1/target,app2/target |
128-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
128+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
129129
| GALLEON_PROVISION_LAYERS | cloud-server |
130130
| GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack |
131131
### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###

‎builder-image/tests/features/messaging.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: EAP messaging tests
55
Scenario: Configure amq7 remote broker
66
Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app with env and true using legacy-s2i-images
77
| variable | value |
8-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
8+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
99
| GALLEON_PROVISION_LAYERS | cloud-server |
1010
| GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack |
1111
| MQ_SERVICE_PREFIX_MAPPING | wf-app-amq7=TEST |

‎builder-image/tests/features/oidc.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Feature: OIDC tests
2424
Scenario: Provision oidc subsystem configuration, legacy.
2525
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-elytron-oidc-client-legacy with env and True using eap8-dev
2626
| variable | value |
27-
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.0 |
27+
| GALLEON_PROVISION_CHANNELS|org.jboss.eap.channels:eap-8.1 |
2828
| GALLEON_PROVISION_LAYERS | cloud-server,elytron-oidc-client |
2929
| GALLEON_PROVISION_FEATURE_PACKS|org.jboss.eap:wildfly-ee-galleon-pack,org.jboss.eap.cloud:eap-cloud-galleon-pack |
3030

‎builder-image/tests/features/xp.feature‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@ Scenario: Check that trimmed server provisioned using galleon plugin works fine
3636
Then XML file /opt/server/standalone/configuration/standalone.xml should contain value /home/jboss on XPath //*[local-name()='config-source' and @name='config-map']/*[local-name()='dir']/@path
3737
Then XML file /opt/server/standalone/configuration/standalone.xml should contain value 99 on XPath //*[local-name()='config-source' and @name='config-map']/@ordinal
3838

39+
@ignore
3940
Scenario: Check with env based legacy configuration
4041
Given s2i build http://github.com/openshift/openshift-jee-sample from . using master
4142
| variable | value |
4243
| GALLEON_PROVISION_LAYERS | cloud-server, microprofile-config |
4344
| GALLEON_PROVISION_FEATURE_PACKS | org.jboss.eap.xp:wildfly-galleon-pack,org.jboss.eap.xp.cloud:eap-xp-cloud-galleon-pack |
44-
| GALLEON_PROVISION_CHANNELS | org.jboss.eap.channels:eap-8.0,org.jboss.eap.channels:eap-xp-5.0 |
45+
| GALLEON_PROVISION_CHANNELS | org.jboss.eap.channels:eap-8.1,org.jboss.eap.channels:eap-xp-5.0 |
4546
Then container log should contain Running jboss-eap-8-tech-preview/
4647
Then exactly 2 times container log should contain WFLYSRV0025:
4748

‎test/test-app-advanced-extensions/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<channel>
7878
<manifest>
7979
<groupId>org.jboss.eap.channels</groupId>
80-
<artifactId>eap-8.0</artifactId>
80+
<artifactId>eap-8.1</artifactId>
8181
</manifest>
8282
</channel>
8383
</channels>

‎test/test-app-clustering/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<channel>
5151
<manifest>
5252
<groupId>org.jboss.eap.channels</groupId>
53-
<artifactId>eap-8.0</artifactId>
53+
<artifactId>eap-8.1</artifactId>
5454
</manifest>
5555
</channel>
5656
</channels>

‎test/test-app-default-config/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<channel>
5555
<manifest>
5656
<groupId>org.jboss.eap.channels</groupId>
57-
<artifactId>eap-8.0</artifactId>
57+
<artifactId>eap-8.1</artifactId>
5858
</manifest>
5959
</channel>
6060
</channels>

‎test/test-app-ejb/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<channel>
4646
<manifest>
4747
<groupId>org.jboss.eap.channels</groupId>
48-
<artifactId>eap-8.0</artifactId>
48+
<artifactId>eap-8.1</artifactId>
4949
</manifest>
5050
</channel>
5151
</channels>

0 commit comments

Comments
 (0)