Merge remote-tracking branch 'upstream2/jlink-dev' into 3646

Author: Josh-Matsuoka

.github/workflows/ubi9-openjdk-21.yml

@@ -2,9 +2,9 @@ name: UBI9 OpenJDK 21 S2I Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  IMAGE: openjdk-21-jlink-rhel9
+  IMAGE: ubi9-openjdk-21
 jobs:
   call-openjdkci:
     uses: ./.github/workflows/image-workflow-template.yml
     with:
-      image: openjdk-21-jlink-rhel9
+      image: ubi9-openjdk-21

modules/jlink/tests/features/jlink.feature

@@ -1,21 +1,20 @@
-@ubi9/openjdk-17
 @openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK S2I tests (jlink specific)
 
   Scenario: tech preview warning is printed (OPENJDK-3038)
-      Given failing s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple/target using master
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications from spring-boot-sample-simple/target using master
        | variable            | value        |
        | S2I_ENABLE_JLINK    | true         |
       Then s2i build log should contain Jlink integration is a Tech Preview feature
 
 Scenario: Ensure S2I_ENABLE_JLINK is not set to true
-      Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
-      Then container log should not contain S2I_ENABLE_JLINK=true
-      And run bash -c "test ! -d /tmp/jre && echo PASS" in container and immediately check its output for PASS
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications from spring-boot-sample-simple/target using master
+     Then s2i build log should not contain Jlink integration is a Tech Preview feature
+      And file /tmp/jre should not exist
 
 Scenario: Check that /tmp/jre/bin/java and /tmp/jre/lib/modules exist post s2i build if jlink is enabled.
-      Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.9.2-uberjar
+    Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications from quarkus-quickstarts/getting-started-3.9.2-uberjar
        | variable            | value        |
        | S2I_ENABLE_JLINK    | true         |
-      Then container log should contain S2I_ENABLE_JLINK=true
-      and run bash -c "test -d /tmp/jre/bin/java && test -d /tmp/jre/lib/modules && echo PASS" in container and immediately check its output for PASS
+      Then file /tmp/jre/bin/java should exist and be a file
+       And file /tmp/jre/lib/modules should exist and be a file

templates/jlink/jlinked-app.yaml

@@ -71,7 +71,6 @@ objects:
         FROM -
         RUN if [ ! -f "/opt/jboss/container/java/jlink/preflight.sh" ]; then echo "jlink scripts doesn't exist" 2>&1; exit 1; fi
         USER 0
-        RUN microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install -y java-${JDK_VERSION}-openjdk-jmods
         RUN mkdir -p /mnt/jrootfs
         RUN microdnf install --installroot /mnt/jrootfs --releasever 9 --setopt install_weak_deps=0 --nodocs -y \
         --config=/etc/dnf/dnf.conf \