rh-openjdk · jmtd · Nov 18, 2024 · Nov 18, 2024
diff --git a/modules/jolokia/8.2/tests/features/jolokia.feature b/modules/jolokia/8.2/tests/features/jolokia.feature
@@ -8,14 +8,14 @@ Feature: Openshift OpenJDK Jolokia tests
     Then run sh -c 'jar xf /usr/share/java/jolokia-jvm-agent/jolokia-jvm.jar META-INF/maven/org.jolokia/jolokia-jvm/pom.properties && grep ${JOLOKIA_VERSION} META-INF/maven/org.jolokia/jolokia-jvm/pom.properties' in container and check its output for version=
 
   Scenario: Check jolokia port is available
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
     Then check that port 8778 is open
     And  inspect container
        | path                    | value       |
        | /Config/ExposedPorts    | 8778/tcp    |
 
   Scenario: Ensure Jolokia diagnostic options work correctly
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
        | variable         | value               |
        | JAVA_ARGS        | Hello from CTF test |
        | JAVA_DIAGNOSTICS | true                |

diff --git a/modules/jvm/api/tests/features/memory.feature b/modules/jvm/api/tests/features/memory.feature
@@ -62,5 +62,5 @@ Feature: OPENJDK-559 JVM Memory tests
   @ubi8/openjdk-17
   @ubi8/openjdk-21
   Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
     Then s2i build log should match regex INFO Using MAVEN_OPTS.*-XX:MaxRAMPercentage=25.0$
diff --git a/modules/maven/s2i/tests/features/java_s2i.feature b/modules/maven/s2i/tests/features/java_s2i.feature
diff --git a/modules/maven/s2i/tests/features/java_s2i_inc.feature b/modules/maven/s2i/tests/features/java_s2i_inc.feature
@@ -6,12 +6,12 @@ Feature: Openshift OpenJDK S2I tests
 
   # test incremental builds
   Scenario: Check incremental builds cache .m2
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
         | variable    | value               |
         | JAVA_ARGS   | Hello from CTF test |
     Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
      And s2i build log should contain Downloading from central:
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet with env and incremental
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet with env and incremental
         | variable    | value               |
         | JAVA_ARGS   | Hello from CTF test |
     Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test

diff --git a/modules/maven/s2i/tests/features/java_s2i_quarkus.feature b/modules/maven/s2i/tests/features/java_s2i_quarkus.feature
@@ -3,7 +3,7 @@
 @ubi8/openjdk-21
 Feature: Openshift OpenJDK S2I tests (Quarkus-based)
   Scenario: Ensure that run-env.sh placed in the JAVA_APP_DIR is sourced in the run script before launching java
-      Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
+      Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
        | variable            | value        |
        | S2I_SOURCE_DATA_DIR | ./           |
        | S2I_TARGET_DATA_DIR | /deployments |

diff --git a/modules/run/tests/features/java.runtime.feature b/modules/run/tests/features/java.runtime.feature
@@ -36,17 +36,17 @@ Feature: Openshift OpenJDK Runtime tests
     | JAVA_APP_DIR | /nope  |
   Then available container log should contain ERROR No directory /nope found for auto detection
   Scenario: Ensure JVM_ARGS is no longer present in the run script
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
     Then file /usr/local/s2i/run should not contain JVM_ARGS
 
   Scenario: Ensure JAVA_ARGS are passed through to the running java application
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
        | variable    | value               |
        | JAVA_ARGS   | Hello from CTF test |
     Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
 
   Scenario: Ensure diagnostic options work correctly
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
        | variable         | value               |
        | JAVA_ARGS        | Hello from CTF test |
        | JAVA_DIAGNOSTICS | true                |

diff --git a/modules/run/tests/features/java.security.feature b/modules/run/tests/features/java.security.feature
@@ -4,5 +4,5 @@
 @ubi8/openjdk-21
 Feature: Openshift S2I tests
   Scenario: Check networkaddress.cache.negative.ttl has been set correctly
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from binary-cli-security-property
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from binary-cli-security-property
     Then s2i build log should contain networkaddress.cache.negative.ttl=0
diff --git a/modules/s2i/core/api/tests/features/java_s2i_quarkus.feature b/modules/s2i/core/api/tests/features/java_s2i_quarkus.feature
@@ -5,11 +5,11 @@
 Feature: Openshift OpenJDK S2I tests (Quarkus-based)
 
   Scenario: Ensure Quarkus CDS doesn't fail due to timestamp mismatch (OPENDJK-1673)
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from getting-started
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from getting-started
     Then container log should not contain A jar file is not the one used while building the shared archive file
 
   Scenario: quarkus fast-jar layout works out-of-the-box (OPENJDK-1957)
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
     Then container log should contain INFO quarkus fast-jar package type detected
     And  container log should contain -jar /deployments/quarkus-app/quarkus-run.jar
     And  container log should contain (main) getting-started 1.0.0-SNAPSHOT on JVM (powered by Quarkus
@@ -18,7 +18,7 @@ Feature: Openshift OpenJDK S2I tests (Quarkus-based)
     And  container log should not contain no main manifest attribute
 
   Scenario: quarkus uber-jar layout works out-of-the-box (OPENJDK-1957)
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i with env
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i with env
        | variable             | value    |
        | QUARKUS_PACKAGE_TYPE | uber-jar |
     Then container log should not contain INFO quarkus fast-jar package type detected

diff --git a/modules/s2i/core/api/tests/features/s2i-core.feature b/modules/s2i/core/api/tests/features/s2i-core.feature
@@ -5,15 +5,15 @@
 Feature: Openshift S2I tests
   # OPENJDK-84 - /tmp/src should not be present after build
   Scenario: run an s2i build and check that /tmp/src has been removed afterwards
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
     Then run stat /tmp/src in container and immediately check its output does not contain File:
 
   # OPENJDK-2824 - ensure binary-only s2i doesn't try to change timestamps of
   # S2I_TARGET_DEPLOYMENTS_DIR. Use /var/tmp as a directory where attempting to
   # will fail. This simulates the s2i process running as a random UID, which can't
   # change timestamps on the default directory, /deployments.
   Scenario: Ensure binary-only build doesn't fail trying to set timestamp of S2I_TARGET_DEPLOYMENTS_DIR (OPENJDK-2850)
-      Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from OPENJDK-2408-bin-custom-s2i-assemble with env
+      Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from OPENJDK-2408-bin-custom-s2i-assemble with env
        | variable                   | value |
        | S2I_TARGET_DEPLOYMENTS_DIR | /var/tmp  |
      Then s2i build log should not contain rsync: [generator] failed to set permissions on "/var/tmp/.": Operation not permitted

diff --git a/tests/features/java/ports.feature b/tests/features/java/ports.feature
@@ -4,7 +4,7 @@
 @ubi8/openjdk-21
 Feature: Openshift OpenJDK port tests
   Scenario: Check ports are available
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
     Then check that port 8080 is open
     Then check that port 8443 is open
     Then inspect container