test tagging for openjdk-21 and 21-runtime

Signed-off-by: Jonathan Dowland <[email protected]>
jmtd · Nov 6, 2023 · 72b6ccb · 72b6ccb
1 parent 4dcd0cf
commit 72b6ccb
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 0 deletions.
diff --git a/tests/features/java.security.feature b/tests/features/java.security.feature
@@ -1,5 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
+@ubi9/openjdk-21
 Feature: Openshift S2I tests
   Scenario: Check networkaddress.cache.negative.ttl has been set correctly
     Given s2i build https://github.com/jboss-openshift/openshift-examples/ from binary-cli-security-property

diff --git a/tests/features/java/java_s2i.feature b/tests/features/java/java_s2i.feature
@@ -1,5 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
+@ubi9/openjdk-21
 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

diff --git a/tests/features/java/java_s2i_inc.feature b/tests/features/java/java_s2i_inc.feature
@@ -1,5 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
+@ubi9/openjdk-21
 Feature: Openshift OpenJDK S2I tests
 
   # test incremental builds

diff --git a/tests/features/java/memory.feature b/tests/features/java/memory.feature
@@ -35,6 +35,7 @@ Feature: OPENJDK-559 JVM Memory tests
   # Not the runtime images
   @ubi9/openjdk-11
   @ubi9/openjdk-17
+  @ubi9/openjdk-21
   Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
     Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
     Then s2i build log should match regex INFO Using MAVEN_OPTS.*-XX:MaxRAMPercentage=25.0$
diff --git a/tests/features/java/openjdk.feature b/tests/features/java/openjdk.feature
@@ -8,6 +8,7 @@ Feature: Miscellaneous OpenJDK-related unit tests
     | command | rpm -qa |
     Then available container log should not contain java-1.8.0
     Then available container log should not contain java-17
+    Then available container log should not contain java-21
 
   @ubi9/openjdk-17
   @ubi9/openjdk-17-runtime
@@ -17,6 +18,17 @@ Feature: Miscellaneous OpenJDK-related unit tests
     | command | rpm -qa |
     Then available container log should not contain java-1.8.0
     Then available container log should not contain java-11
+    Then available container log should not contain java-21
+
+  @ubi9/openjdk-21
+  @ubi9/openjdk-21-runtime
+  Scenario: Check that only OpenJDK 21 is installed
+    When container is started with args
+    | arg     | value   |
+    | command | rpm -qa |
+    Then available container log should not contain java-1.8.0
+    Then available container log should not contain java-11
+    Then available container log should not contain java-17
 
   @ubi9
   Scenario: Ensure JAVA_HOME is defined and contains Java
@@ -42,6 +54,7 @@ Feature: Miscellaneous OpenJDK-related unit tests
     | command | ls -1 /usr/lib/jvm |
     Then available container log should not contain java-1.8.0
     Then available container log should not contain java-17
+    Then available container log should not contain java-21
 
   @ubi9/openjdk-17
   @ubi9/openjdk-17-runtime
@@ -51,6 +64,17 @@ Feature: Miscellaneous OpenJDK-related unit tests
     | command | ls -1 /usr/lib/jvm |
     Then available container log should not contain java-1.8.0
     Then available container log should not contain java-11
+    Then available container log should not contain java-21
+
+  @ubi9/openjdk-21
+  @ubi9/openjdk-21-runtime
+  Scenario: Check that directories from other JDKs are not present (JDK21)
+    When container is started with args
+    | arg     | value   |
+    | command | ls -1 /usr/lib/jvm |
+    Then available container log should not contain java-1.8.0
+    Then available container log should not contain java-11
+    Then available container log should not contain java-17
 
   @ubi9
   Scenario: Ensure LANG is defined and contains UTF-8

diff --git a/tests/features/java/openjdk_s2i.feature b/tests/features/java/openjdk_s2i.feature
@@ -1,6 +1,7 @@
 # builder only
 @ubi9/openjdk-11
 @ubi9/openjdk-17
+@ubi9/openjdk-21
 Feature: Openshift OpenJDK-only S2I tests
   Scenario: Check java perf dir owned by default (CLOUD-2070, OPENJDK-91)
     Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet

diff --git a/tests/features/java/ports.feature b/tests/features/java/ports.feature
@@ -1,5 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
+@ubi9/openjdk-21
 Feature: Openshift OpenJDK port tests
 
   Scenario: Check ports are available

diff --git a/tests/features/java/runtime.feature b/tests/features/java/runtime.feature
@@ -1,5 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
+@ubi9/openjdk-21
 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

diff --git a/tests/features/openshift.feature b/tests/features/openshift.feature
@@ -11,6 +11,7 @@ Feature: Tests for all openshift images
   # builder-only test
   @ubi9/openjdk-11
   @ubi9/openjdk-17
+  @ubi9/openjdk-21
   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
diff --git a/tests/features/s2i-core.feature b/tests/features/s2i-core.feature
@@ -1,5 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
+@ubi9/openjdk-21
 Feature: Openshift S2I tests
   # OPENJDK-84 - /tmp/src should not be present after build
   Scenario: run an s2i build and check that /tmp/src has been removed afterwards