From debd1d9947ff41bb929cab3f1ccba3c96d44d280 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Tue, 26 Nov 2024 16:56:48 +0000 Subject: [PATCH] [OPENJDK-3038] echo out Tech Preview warning The jlink feature will initially ship as TP. https://issues.redhat.com/browse/OPENJDK-3038 Signed-off-by: Jonathan Dowland --- .../artifacts/opt/jboss/container/java/jlink/preflight.sh | 7 +++++++ modules/jlink/tests/features/jlink.feature | 1 + modules/s2i/bash/artifacts/usr/local/s2i/assemble | 1 + 3 files changed, 9 insertions(+) diff --git a/modules/jlink/artifacts/opt/jboss/container/java/jlink/preflight.sh b/modules/jlink/artifacts/opt/jboss/container/java/jlink/preflight.sh index ab7aba35..cf32420d 100644 --- 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,10 @@ +jlink_techpreview_warning() +{ + echo "Jlink integration is a Tech Preview feature." + echo "See " + echo "for more information." +} + 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 index 89c61800..1546a4da 100644 --- a/modules/jlink/tests/features/jlink.feature +++ b/modules/jlink/tests/features/jlink.feature @@ -7,6 +7,7 @@ Scenario: Ensure jlinked builder is used to build the containerized application | S2I_ENABLE_JLINK | true | | QUARKUS_PACKAGE_TYPE| uber-jar | Then run ls /tmp/jre in container and check its output for bin + And container 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 index 76999b56..e2f1e4ef 100644 --- 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"