Merge pull request #527 from jmtd/OPENJDK-3038-tech-preview

[OPENJDK-3038] echo out Tech Preview warning
rh-openjdk · Dec 4, 2024 · 6548e31 · 6548e31
2 parents 3dd45b2 + 4f67aa3
commit 6548e31
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/modules/jlink/artifacts/opt/jboss/container/java/jlink/preflight.sh b/modules/jlink/artifacts/opt/jboss/container/java/jlink/preflight.sh
@@ -1,3 +1,14 @@
+jlink_techpreview_warning()
+{
+  {
+    echo "WARNING WARNING WARNING"
+    echo "        Jlink integration is a Tech Preview feature!"
+    echo "        See <https://access.redhat.com/support/offerings/techpreview/>"
+    echo "        for more information."
+    echo "WARNING WARNING WARNING"
+  } >&2
+}
+
 jlink_preflight_check()
 {
     # preflight check: do we have what we need?

diff --git a/modules/jlink/tests/features/jlink.feature b/modules/jlink/tests/features/jlink.feature
@@ -1,12 +1,12 @@
 @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
+
+  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
        | variable            | value        |
        | S2I_ENABLE_JLINK    | true         |
-       | QUARKUS_PACKAGE_TYPE| uber-jar     |
-      Then run ls /tmp/jre in container and check its output for bin
+      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

diff --git a/modules/s2i/bash/artifacts/usr/local/s2i/assemble b/modules/s2i/bash/artifacts/usr/local/s2i/assemble
@@ -22,6 +22,7 @@ setup_java_app_and_lib
 if [ "$S2I_ENABLE_JLINK" = "true" ]; then
 
     source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/preflight.sh"
+    jlink_techpreview_warning
     jlink_preflight_check
 
     source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"