Merge remote-tracking branch 'upstream/jlink-dev' into jlink-stage-1

Author: Josh-Matsuoka

modules/jlink/artifacts/opt/jboss/container/java/jlink/preflight.sh

@@ -0,0 +1,14 @@
+jlink_preflight_check()
+{
+    # preflight check: do we have what we need?
+    if [ "$JAVA_VERSION" -lt 11 ]; then
+      echo "Jlink integration not available for JDK${JAVA_VERSION}!"
+      echo "Jlink integration is only supported for JDK versions 11 and newer."
+      exit 1
+    fi
+    if [ ! -d /usr/lib/jvm/java/jmods ]; then
+      echo "Jlink integration requires the jmods RPM to be installed in the builder image, e.g."
+      echo "        microdnf install -y java-${JAVA_VERSION}-openjdk-jmods"
+      exit 1
+    fi
+}

modules/jlink/tests/features/jlink.feature

@@ -0,0 +1,15 @@
+@ubi9/openjdk-11
+@ubi9/openjdk-17
+@ubi9/openjdk-21
+Feature: Openshift OpenJDK S2I tests (jlink specific)
+Scenario: Ensure jlinked builder is used to build the containerized application image
+      Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
+       | variable            | value        |
+       | S2I_ENABLE_JLINK    | true         |
+       | QUARKUS_PACKAGE_TYPE| uber-jar     |
+      Then run ls /tmp/jre in container and check its output for bin
+
+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

modules/run/module.yaml

@@ -59,3 +59,4 @@ modules:
   - name: jboss.container.user
   - name: jboss.container.java.jvm
   - name: jboss.container.util.logging
+  - name: jboss.container.util.pathfinder

modules/s2i/bash/artifacts/usr/local/s2i/assemble

@@ -16,22 +16,28 @@ maven_s2i_build
 
 # run the pathfinder scripts to define JAVA_APP_JAR and JAVA_LIB_DIR
 source "${JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE}/pathfinder.sh"
-echo "Setting up java app and lib variables"
 setup_java_app_and_lib
 
 # include our jlink scripts
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"
-echo "Invoking mkdeps"
-generate_deps
+if [ "$S2I_ENABLE_JLINK" = "true" ]; then
 
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh"
-echo "Stripping dependencies"
-mkstrippeddeps
+    source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/preflight.sh"
+    jlink_preflight_check
 
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh"
-echo "Generating JDK dependencies"
-generatejdkdeps
+    source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"
+    echo "Invoking mkdeps"
+    generate_deps
 
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
-echo "Linking jre"
-generate_jre_image
+    source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh"
+    echo "Stripping dependencies"
+    mkstrippeddeps
+
+    source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh"
+    echo "Generating JDK dependencies"
+    generatejdkdeps
+
+    source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
+    echo "Linking jre"
+    generate_jre_image
+
+fi

modules/s2i/core/module.yaml

@@ -116,7 +116,6 @@ envs:
   description: ^
     Enables the Jdeps/JLink workflow to minimize JRE size
   example: "false"
-  value: "false"
 
 run:
   cmd: