Merge changes from upstream

Author: Josh-Matsuoka

modules/jlink/tests/features/jlink.feature

@@ -12,3 +12,10 @@ 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
+
+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
+       | 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

templates/jlink/README.md

@@ -75,21 +75,19 @@ See all the OpenShift objects that were created:
 
 ## Stage 3: Kick off builds
 
-There will be three BuildConfigs, called something like
+Instantiating the template will cause 3 separate BuildConfigs to be created and will automatically start their builds in sequence:
 
-1. $APPNAME-jlink-builder-jdk-21
-2. $APPNAME-jlink-s2i-jdk-21
+1. $APPNAME-jlink-builder-jdk-$JDK_VERSION
+2. $APPNAME-jlink-s2i-jdk-$JDK_VERSION
 3. $APPNAME-multistage-buildconfig
 
-Where $APPNAME is the parameter initially passed to the template.
+Where $APPNAME and $JDK_VERSION are the paremeters initially passed to the template.
 
-Start a build for (1). Once complete, builds for (2) and (3) should be
-automatically triggered in sequence.
+A build will automatically start for (1). Once complete, builds for (2) and (3) should be automatically triggered in sequence.
 
 ## Stage 4: create deployment
 
-The ImageStreamTag `$APPNAME-lightweight-image:latest` will be populated with the new
-application container image.
+The ImageStreamTag `$APPNAME-lightweight-image:latest` will be populated with the new application container image.
 
 Create a deployment to see it work. E.g., in the Developer Perspective, select
 "+Add", "Container Images", "Image stream tag from internal registry", ...,