[JDK17] Use openshift sample app, now compatible with JDk17

jfdenise · luck3y · commit b68519639599 · 2022-06-02T10:18:56.000-05:00
diff --git a/tests/features/access-log-valve.feature b/tests/features/access-log-valve.feature
@@ -110,7 +110,7 @@ Feature: EAP Openshift access-log-valve and log handler tests
     And file /tmp/boot.log should contain You have set ENABLE_ACCESS_LOG=true to add the access log logger category 'org.infinispan.rest.logging.RestAccessLoggingHandler'. However one already exists which has conflicting values. Fix your configuration to contain the logging subsystem for this to happen.
 
   Scenario: Access Log valve, No undertow should give error
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
        | variable                   | value         |
        | GALLEON_PROVISION_LAYERS   | core-server   |
        | ENABLE_ACCESS_LOG          | true          |
diff --git a/tests/features/admin-jdk17.feature b/tests/features/admin-jdk17.feature
@@ -10,7 +10,7 @@ Feature: EAP Openshift admin
     And file /opt/eap/standalone/configuration/mgmt-users.properties should contain kabir
 
   Scenario: Standard configuration, galleon s2i
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
        | variable                 | value           |
        | ADMIN_USERNAME           | kabir           |
        | ADMIN_PASSWORD           | pass            |
diff --git a/tests/features/basic.feature b/tests/features/basic.feature
@@ -320,7 +320,7 @@ Feature: Common EAP tests
     Then file at /opt/eap/modules/system/layers/openshift/org/jgroups/main should not exist
 
  Scenario: readinessProbe runs successfully on cloud-server trimmed server
-   Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+   Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
     | variable                        | value                                                                                  |
     | GALLEON_PROVISION_LAYERS        | cloud-server |
    Then exactly 2 times container log should contain WFLYSRV0025
diff --git a/tests/features/datasource.feature b/tests/features/datasource.feature
@@ -789,7 +789,7 @@ Feature: EAP Openshift datasources
     And container log should not contain WARN The default datasource for the ee subsystem has been guessed to be
 
   Scenario: check that exampleDS is not generated by default, galleon s2i
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
        | variable                           | value                |
        | GALLEON_PROVISION_LAYERS           | cloud-server   |
     Then container log should contain WFLYSRV0025
diff --git a/tests/features/filters.feature b/tests/features/filters.feature
@@ -91,7 +91,7 @@ Feature: EAP 7 Openshift filters
     And file /tmp/boot.log should contain You have set environment variables to add an undertow filter-ref called One-Header but one already exists. Fix your configuration so it does not contain clashing filter-refs for this to happen.
 
   Scenario: Filters, No undertow should give error
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
       | variable                         | value        |
       | GALLEON_PROVISION_LAYERS         | core-server  |
       | FILTERS                          | FOO          |
diff --git a/tests/features/galleon.feature b/tests/features/galleon.feature
@@ -4,7 +4,7 @@ Feature: Openshift EAP galleon s2i tests
 # CLOUD-3949
 @ignore 
   Scenario: Test microprofile config.
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
       | variable                             | value         |
       | GALLEON_PROVISION_LAYERS             | cloud-server,microprofile-openapi,microprofile-jwt,microprofile-fault-tolerance,-jpa,jpa-distributed,web-clustering  |
     Then container log should contain WFLYSRV0025
@@ -14,7 +14,7 @@ Feature: Openshift EAP galleon s2i tests
       | port     | 8080  |
 
   Scenario: Galleon provision cloud-server
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
     | variable                        | value                                                                                  |
     | GALLEON_PROVISION_LAYERS        | cloud-server |
     Then container log should contain WFLYSRV0025
@@ -24,7 +24,7 @@ Feature: Openshift EAP galleon s2i tests
     Then XML file /s2i-output/server/.galleon/provisioning.xml should contain value cloud-server on XPath //*[local-name()='installation']/*[local-name()='config']/*[local-name()='layers']/*[local-name()='include']/@name
 
   Scenario: Galleon provision jaxrs-server
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
     | variable                        | value                                                                                  |
     | GALLEON_PROVISION_LAYERS        | jaxrs-server |
     Then container log should contain WFLYSRV0025
@@ -34,7 +34,7 @@ Feature: Openshift EAP galleon s2i tests
     Then XML file /s2i-output/server/.galleon/provisioning.xml should contain value jaxrs-server on XPath //*[local-name()='installation']/*[local-name()='config']/*[local-name()='layers']/*[local-name()='include']/@name
 
   Scenario: Galleon provision datasources-web-server
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
     | variable                        | value                                                                                  |
     | GALLEON_PROVISION_LAYERS        | datasources-web-server |
     Then container log should contain WFLYSRV0025
@@ -44,7 +44,7 @@ Feature: Openshift EAP galleon s2i tests
     Then XML file /s2i-output/server/.galleon/provisioning.xml should contain value datasources-web-server on XPath //*[local-name()='installation']/*[local-name()='config']/*[local-name()='layers']/*[local-name()='include']/@name
 
   Scenario: Galleon provision web-clustering
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
     | variable                        | value                                                                                  |
     | GALLEON_PROVISION_LAYERS        | cloud-server,web-clustering            |
     Then container log should contain WFLYSRV0025
@@ -101,17 +101,17 @@ Feature: Openshift EAP galleon s2i tests
     | GALLEON_VERSION | 0.0.0.Foo |
 
   Scenario: failing to build the example due to multiple env vars in conflict
-    Given failing s2i build git://github.com/jfdenise/openshift-jee-sample from . using master
+    Given failing s2i build git://github.com/openshift/openshift-jee-sample from . using master
     | variable          | value                                                                                  |
     | GALLEON_PROVISION_SERVER        | slim-default-server |
     | GALLEON_PROVISION_LAYERS        | cloud-server       |
  
   Scenario: build the example without galleon, check that s2i-output doesn't contain a copied server
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
     Then file /s2i-output/server/ should not exist
 
   Scenario: build the example with galleon, check that s2i-output contain a copied server
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
     | variable          | value                                                                                  |
     | GALLEON_PROVISION_DEFAULT_FAT_SERVER        | true |
     Then file /s2i-output/server/ should exist
@@ -131,12 +131,12 @@ Feature: Openshift EAP galleon s2i tests
     Then container log should contain WFLYCTL0310: Extension module org.keycloak.keycloak-adapter-subsystem not found
 
   Scenario: failing to build the example due to invalid layer name
-    Given failing s2i build git://github.com/jfdenise/openshift-jee-sample from . using master
+    Given failing s2i build git://github.com/openshift/openshift-jee-sample from . using master
     | variable          | value                                                                                  |
     | GALLEON_PROVISION_LAYERS        | foo |
 
   Scenario: failing to build the example due to invalid layer name
-    Given failing s2i build git://github.com/jfdenise/openshift-jee-sample from . using master
+    Given failing s2i build git://github.com/openshift/openshift-jee-sample from . using master
     | variable          | value                                                                                  |
     | GALLEON_PROVISION_LAYERS        | cloud-server,foo |
 
@@ -167,7 +167,7 @@ Feature: Openshift EAP galleon s2i tests
   # microprofile layer didn't make it in CD19
   @ignore
   Scenario: Test cloud-server,microprofile
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and True using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and True using master
       | variable                             | value         |
       | GALLEON_PROVISION_LAYERS             | cloud-server,microprofile  |
     Then container log should contain WFLYSRV0025
@@ -180,7 +180,7 @@ Feature: Openshift EAP galleon s2i tests
 
   # Tests for specified exclusion
   Scenario: Test datasources-web-server, exclude datasources
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and True using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and True using master
       | variable                             | value         |
       | GALLEON_PROVISION_LAYERS             | datasources-web-server,-datasources  |
     Then container log should contain WFLYSRV0025
@@ -230,12 +230,12 @@ Feature: Openshift EAP galleon s2i tests
     Then XML file /opt/eap/.galleon/provisioning.xml should contain value jpa on XPath //*[local-name()='installation']/*[local-name()='config']/*[local-name()='layers']/*[local-name()='exclude']/@name
 
   Scenario: Test jaxrs-server, exclude datasources, must fail
-    Given failing s2i build git://github.com/jfdenise/openshift-jee-sample from . using master
+    Given failing s2i build git://github.com/openshift/openshift-jee-sample from . using master
       | variable                             | value         |
       | GALLEON_PROVISION_LAYERS             | jaxrs-server,-datasources |
 
   Scenario: Test jaxrs-server, exclude foo, must fail
-    Given failing s2i build git://github.com/jfdenise/openshift-jee-sample from . using master
+    Given failing s2i build git://github.com/openshift/openshift-jee-sample from . using master
       | variable                             | value         |
       | GALLEON_PROVISION_LAYERS             | jaxrs-server,-foo |
 
@@ -342,7 +342,7 @@ Feature: Openshift EAP galleon s2i tests
 # CLOUD-3949
 @ignore 
   Scenario: Test cloud-server, exclude open-tracing and observability
-    Given failing s2i build git://github.com/jfdenise/openshift-jee-sample from .
+    Given failing s2i build git://github.com/openshift/openshift-jee-sample from .
       | variable                             | value         |
       | GALLEON_PROVISION_LAYERS             | cloud-server,-open-tracing,-observability  |
 
@@ -377,7 +377,7 @@ Feature: Openshift EAP galleon s2i tests
   # microprofile layer didn't make it in CD19
   @ignore
   Scenario: Test jaxrs-server+microprofile, exclude all mp layers.
-    Given failing s2i build git://github.com/jfdenise/openshift-jee-sample from .
+    Given failing s2i build git://github.com/openshift/openshift-jee-sample from .
       | variable                             | value         |
       | GALLEON_PROVISION_LAYERS             | jaxrs-server,microprofile,-microprofile-config,-microprofile-fault-tolerance,-microprofile-jwt,-microprofile-metrics,-microprofile-openapi,-open-tracing  |
     Then container log should contain WFLYSRV0025
diff --git a/tests/features/https-jdk17.feature b/tests/features/https-jdk17.feature
@@ -29,7 +29,7 @@ Scenario: Configure HTTPS with an existing https-listener should give error
     And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value /opt/eap/keystore.jks on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store'][@name="LocalhostKeyStore"]/*[local-name()='file']/@path
 
 Scenario: Https, No undertow should give error
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
        | variable                   | value         |
        | GALLEON_PROVISION_LAYERS   | core-server   |
        | EAP_HTTPS_PASSWORD         | p@ssw0rd      |
@@ -39,7 +39,7 @@ Scenario: Https, No undertow should give error
     Then container log should contain You have set environment variables to configure Https. However, your base configuration does not contain the Undertow subsystem
 
   Scenario: Use Elytron for HTTPS, galleon s2i (the default for JDK17)
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
       | variable                      | value                       |
       | HTTPS_PASSWORD                | p@ssw0rd                    |
       | HTTPS_KEYSTORE_DIR            | /opt/eap                    |
diff --git a/tests/features/jgroups.feature b/tests/features/jgroups.feature
@@ -94,7 +94,7 @@ Scenario: Verify configuration and protocol positions jgroups-encrypt, DNS ping
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value pbcast.GMS on XPath //*[local-name()="stack"][@name="tcp"]/*[local-name()="auth-protocol"][@type="AUTH"]/following-sibling::*[1]/@type
 
   Scenario: jgroups-encrypt, galleon
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
     | variable                        | value                                                                                  |
     | GALLEON_PROVISION_LAYERS        | cloud-server,web-clustering            |
     | JGROUPS_ENCRYPT_SECRET          | eap_jgroups_encrypt_secret             |
@@ -115,7 +115,7 @@ Scenario: Verify configuration and protocol positions jgroups-encrypt, DNS ping
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value pbcast.NAKACK2 on XPath //*[local-name()="stack"][@name="tcp"]/*[local-name()="encrypt-protocol"][@type="SYM_ENCRYPT"]/following-sibling::*[1]/@type
 
   Scenario: Check jgroups encryption with missing keystore dir creates the location relative to the server, galleon
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
        | variable                                     | value                                  |
        | GALLEON_PROVISION_LAYERS                     | cloud-server,web-clustering            |
        | JGROUPS_ENCRYPT_PROTOCOL                     | SYM_ENCRYPT                            |
@@ -126,7 +126,7 @@ Scenario: Verify configuration and protocol positions jgroups-encrypt, DNS ping
     Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value jboss.server.config.dir on XPath //*[local-name()="key-store"][@name="keystore.jks"]/*[local-name()="file"]/@relative-to
 
   Scenario: Verify configuration and protocol positions jgroups-encrypt, DNS ping protocol and AUTH, galleon
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
        | variable                                     | value                                  |
        | GALLEON_PROVISION_LAYERS                     | cloud-server,web-clustering            |
        | JGROUPS_ENCRYPT_SECRET                       | eap_jgroups_encrypt_secret             |
@@ -186,7 +186,7 @@ Scenario: Verify configuration jgroups deprecated ASYM_ENCRYPT, kubernetes.KUBE_
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value pbcast.GMS on XPath //*[local-name()='stack'][@name='tcp']/*[local-name()='auth-protocol'][@type='AUTH']/following-sibling::*[1]/@type
 
 Scenario: Verify configuration jgroups deprecated ASYM_ENCRYPT, dns.DNS_PING ping protocol and AUTH with Galleon
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
        | variable                                     | value                                  |
        | GALLEON_PROVISION_LAYERS                     | cloud-server,web-clustering            |
        | JGROUPS_ENCRYPT_PROTOCOL                     | ASYM_ENCRYPT                           |
@@ -261,7 +261,7 @@ Scenario: Verify configuration jgroups non-deprecated ASYM_ENCRYPT, dns.DNS_PING
      And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should have 0 elements on XPath //*[local-name()='tls']/*[local-name()='key-stores']/*[local-name()='key-store'][@name='keystore.jks']/*[local-name()='file']/@relative-to
 
   Scenario: Verify configuration jgroups non-deprecated ASYM_ENCRYPT, kubernetes.KUBE_PING ping protocol ping and AUTH with Galleon
-    Given s2i build git://github.com/jfdenise/openshift-jee-sample from . with env and true using master
+    Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
        | variable                                     | value                           |
        | GALLEON_PROVISION_LAYERS                     | cloud-server,web-clustering     |
        | JGROUPS_ENCRYPT_PROTOCOL                     | ASYM_ENCRYPT                    |
diff --git a/tests/features/logging.feature b/tests/features/logging.feature
diff --git a/tests/features/ports.feature b/tests/features/ports.feature
diff --git a/tests/features/resource_adapters.feature b/tests/features/resource_adapters.feature
diff --git a/tests/features/s2i.feature b/tests/features/s2i.feature
