Merge pull request #536 from Josh-Matsuoka/rename-ubi9-jdk21

[OPENJDK-3542] Rename ubi9/openjdk21 images to reflect tech preview

Author: jmtd

.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: ubi9-openjdk-21
+  IMAGE: openjdk-21-jlink-rhel9
 jobs:
   call-openjdkci:
     uses: ./.github/workflows/image-workflow-template.yml
     with:
-      image: ubi9-openjdk-21
+      image: openjdk-21-jlink-rhel9

modules/jlink/tests/features/jlink.feature

@@ -1,5 +1,5 @@
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK S2I tests (jlink specific)
 
   Scenario: tech preview warning is printed (OPENJDK-3038)

tests/features/java.security.feature

@@ -1,6 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift S2I tests
   Scenario: Check networkaddress.cache.negative.ttl has been set correctly
     Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from binary-cli-security-property

tests/features/java/java_s2i.feature

@@ -2,7 +2,7 @@
 @ignore
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK S2I tests
 # NOTE: these tests should be usable with the other images once we have refactored the JDK scripts.
 # These builds do not actually run maven. This is important, because the proxy

tests/features/java/java_s2i_inc.feature

@@ -1,6 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK S2I tests
 
   # test incremental builds

tests/features/java/memory.feature

@@ -35,7 +35,7 @@ Feature: OPENJDK-559 JVM Memory tests
   # Not the runtime images
   @ubi9/openjdk-11
   @ubi9/openjdk-17
-  @ubi9/openjdk-21
+  @openjdk-tech-preview/openjdk-21-jlink-rhel9
   Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
     Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
     Then s2i build log should match regex INFO Using MAVEN_OPTS.*-XX:MaxRAMPercentage=25.0$

tests/features/java/openjdk_s2i.feature

@@ -1,7 +1,7 @@
 # builder only
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK-only S2I tests
 
   @ignore

tests/features/java/ports.feature

@@ -1,6 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK port tests
 
   Scenario: Check ports are available

tests/features/java/runtime.feature

@@ -1,6 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK Runtime tests
 
   Scenario: Ensure JAVA_ARGS is passed through, diagnostic options work correctly, JVM_ARGS not present in run script, OPENJDK-474 JAVA_ARGS not repeated

tests/features/openshift.feature

@@ -11,7 +11,7 @@ Feature: Tests for all openshift images
   # builder-only test
   @ubi9/openjdk-11
   @ubi9/openjdk-17
-  @ubi9/openjdk-21
+  @openjdk-tech-preview/openjdk-21-jlink-rhel9
   Scenario: Check that builder labels are correctly set
     Given image is built
     Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i