Skip to content

Commit d9acddf

Browse files
jfdenisejfdenise
authored
Merge pull request #60 from jfdenise/tests-for-8.1
Tests for 8.1
2 parents 5d7a671 + e32edd5 commit d9acddf

File tree

38 files changed

+97
-82
lines changed

38 files changed

+97
-82
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Feature: EAP basic tests
44

55
Scenario: Check that the legacy default config provisioned using galleon plugin works fine
6-
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-default-config with env and True using eap8-dev
6+
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-default-config with env and True using eap81-beta-dev
77
| variable | value |
88
| S2I_SERVER_DIR | server |
99
### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
@@ -23,7 +23,7 @@ Feature: EAP basic tests
2323
| port | 8080 |
2424

2525
Scenario: Check if image version and release is printed on boot
26-
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app with env and True using eap8-dev
26+
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app with env and True using eap81-beta-dev
2727
| variable | value |
2828
### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
2929
Then container log should contain Running jboss-eap-8-tech-preview/

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
Feature: EAP configured for datasources
44

55
Scenario: Build image with server and datasource
6-
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
6+
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-postgres with env and true using eap81-beta-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 ###
1212
Then container log should contain WFLYSRV0025
1313

1414
Scenario: Build image with server and datasources
15-
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
15+
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 eap81-beta-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 |
20-
| ORACLE_DRIVER_VERSION | 19.3.0.0|
20+
| ORACLE_DRIVER_VERSION | 23.6.0.24.10|
2121
### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
2222
Then exactly 2 times container log should contain WFLYSRV0025:
2323

2424
Scenario: Build image with server and datasources
25-
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-postgresql-oracle with env and true using eap8-dev
25+
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-postgresql-oracle with env and true using eap81-beta-dev
2626
| variable | value |
2727
| POSTGRESQL_DRIVER_VERSION | 42.2.19 |
28-
| ORACLE_DRIVER_VERSION | 19.3.0.0|
28+
| ORACLE_DRIVER_VERSION | 23.6.0.24.10|
2929
### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
3030
Then exactly 2 times container log should contain WFLYSRV0025:
3131

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Feature: EAP extensions tests
44

55
Scenario: Build server image
6-
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-advanced-extensions with env and True using eap8-dev
6+
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-advanced-extensions with env and True using eap81-beta-dev
77
| variable | value |
88
### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
99
Then exactly 2 times container log should contain WFLYSRV0025:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Feature: Openshift EAP jgroups
44

55
Scenario: Build server image
6-
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-clustering with env and true using eap8-dev
6+
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-clustering with env and true using eap81-beta-dev
77
| variable | value |
88
### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
99
Then exactly 2 times container log should contain WFLYSRV0025:

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
@jboss-eap-8
2-
# Caused by Keycloak 24 in the manifest
3-
@ignore
41
Feature: Keycloak saml tests
52

63
Scenario: Provision the server with keycloak deployment.
74
Given XML namespaces
85
| prefix | url |
96
| ns | urn:jboss:domain:keycloak:1.4 |
10-
Given s2i build http://github.com/jfdenise/jboss-eap-8-openshift-image from test/test-app-keycloak-saml using internal-tests
7+
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-keycloak-saml using eap81-beta-dev
118
| variable | value |
129

1310
Scenario: Enable keycloak automatic registration.
@@ -41,4 +38,4 @@ Feature: Keycloak saml tests
4138
And XML file /opt/server/standalone/configuration/standalone.xml should contain value saml-app on XPath //*[local-name()='secure-deployment'][@name="saml-app.war"]/*[local-name()='SP']/@entityID
4239
And XML file /opt/server/standalone/configuration/standalone.xml should contain value EXTERNAL on XPath //*[local-name()='secure-deployment'][@name="saml-app.war"]/*[local-name()='SP']/@sslPolicy
4340
And XML file /opt/server/standalone/configuration/standalone.xml should contain value true on XPath //*[local-name()='secure-deployment'][@name="saml-app.war"]/*[local-name()='SP']/*[local-name()='Keys']/*[local-name()='Key']/@signing
44-
And XML file /opt/server/standalone/configuration/standalone.xml should contain value idp on XPath //*[local-name()='secure-deployment'][@name="saml-app.war"]/*[local-name()='SP']/*[local-name()='IDP']/@entityID
41+
And XML file /opt/server/standalone/configuration/standalone.xml should contain value idp on XPath //*[local-name()='secure-deployment'][@name="saml-app.war"]/*[local-name()='SP']/*[local-name()='IDP']/@entityID

‎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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
Feature: EAP Legacy s2i tests
44

55
Scenario: Test provisioning.xml file
6-
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
6+
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 eap81-beta-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
@@ -122,10 +122,10 @@ Scenario: Test external driver created during s2i.
122122
| port | 8080 |
123123

124124
Scenario: Multiple deployments legacy
125-
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
125+
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 eap81-beta-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: 2 additions & 2 deletions
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 |
@@ -58,7 +58,7 @@ Scenario: Configure amq7 remote broker
5858
Then container log should contain WFLYSRV0025
5959

6060
Scenario: deploys the test-app-mdb app, then checks if it's deployed properly with Queues and Topics added
61-
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-mdb with env and True using eap8-dev
61+
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-mdb with env and True using eap81-beta-dev
6262
| variable | value |
6363
| MQ_TOPICS | HELLOWORLDMDBTopic |
6464
| MQ_QUEUES | HELLOWORLDMDBQueue |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Feature: OIDC tests
66
Given XML namespaces
77
| prefix | url |
88
| ns | urn:wildfly:elytron-oidc-client:2.0 |
9-
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-elytron-oidc-client with env and True using eap8-dev
9+
Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-elytron-oidc-client with env and True using eap81-beta-dev
1010
| variable | value |
1111
| OIDC_PROVIDER_NAME | keycloak |
1212
| OIDC_PROVIDER_URL | http://localhost:8080/auth/realms/demo |
@@ -22,9 +22,9 @@ Feature: OIDC tests
2222
And XML file /opt/server/standalone/configuration/standalone.xml should contain value http://localhost:8080/auth/realms/demo on XPath //*[local-name()='provider']/*[local-name()='provider-url']
2323

2424
Scenario: Provision oidc subsystem configuration, legacy.
25-
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
25+
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 eap81-beta-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

0 commit comments

Comments
 (0)