Tag Behave tests for JDK17

jmtd · jmtd · commit 7c5ce9983fa7 · 2021-09-10T10:47:14.000+01:00
Signed-off-by: Jonathan Dowland &lt;jdowland@redhat.com&gt;
diff --git a/tests/features/java.security.feature b/tests/features/java.security.feature
@@ -1,6 +1,7 @@
 @openjdk
 @ubi8/openjdk-8
 @ubi8/openjdk-11
+@ubi8/openjdk-17
 @redhat-openjdk-18
 Feature: Openshift S2I tests
   Scenario: Check networkaddress.cache.negative.ttl has been set correctly
diff --git a/tests/features/java/gc.feature b/tests/features/java/gc.feature
@@ -1,6 +1,7 @@
 @openjdk
 @ubi8/openjdk-8
 @ubi8/openjdk-11
+@ubi8/openjdk-17
 @redhat-openjdk-18
 @openj9
 Feature: Openshift OpenJDK GC tests
diff --git a/tests/features/java/java_s2i.feature b/tests/features/java/java_s2i.feature
@@ -1,6 +1,7 @@
 @openjdk
 @ubi8/openjdk-8
 @ubi8/openjdk-11
+@ubi8/openjdk-17
 @redhat-openjdk-18
 @openj9
 Feature: Openshift OpenJDK S2I tests
diff --git a/tests/features/java/java_s2i_inc.feature b/tests/features/java/java_s2i_inc.feature
@@ -1,6 +1,7 @@
 @openjdk
 @ubi8/openjdk-8
 @ubi8/openjdk-11
+@ubi8/openjdk-17
 @redhat-openjdk-18
 @openj9
 Feature: Openshift OpenJDK S2I tests
diff --git a/tests/features/java/openjdk.feature b/tests/features/java/openjdk.feature
@@ -12,6 +12,7 @@ Feature: Miscellaneous OpenJDK-related unit tests
     | arg     | value   |
     | command | rpm -qa |
     Then available container log should not contain java-11
+    Then available container log should not contain java-17
 
   @openjdk/openjdk-11-rhel7
   @openjdk/openjdk-11-ubi8
@@ -23,6 +24,15 @@ Feature: Miscellaneous OpenJDK-related unit tests
     | arg     | value   |
     | command | rpm -qa |
     Then available container log should not contain java-1.8.0
+    Then available container log should not contain java-17
+
+  @ubi8/openjdk-17
+  Scenario: Check that only OpenJDK 17 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
 
   @ubi8
   @openjdk
diff --git a/tests/features/java/ports.feature b/tests/features/java/ports.feature
@@ -1,6 +1,7 @@
 @openjdk
 @ubi8/openjdk-8
 @ubi8/openjdk-11
+@ubi8/openjdk-17
 @redhat-openjdk-18
 @openj9
 Feature: Openshift OpenJDK port tests
diff --git a/tests/features/java/runtime.feature b/tests/features/java/runtime.feature
@@ -3,6 +3,7 @@ Feature: Openshift OpenJDK Runtime tests
   @openjdk
   @ubi8/openjdk-8
   @ubi8/openjdk-11
+  @ubi8/openjdk-17
   @redhat-openjdk-18
   @openj9
   Scenario: Ensure JVM_ARGS is no longer present in the run script
@@ -12,6 +13,7 @@ Feature: Openshift OpenJDK Runtime tests
   @openjdk
   @ubi8/openjdk-8
   @ubi8/openjdk-11
+  @ubi8/openjdk-17
   @redhat-openjdk-18
   @openj9
   Scenario: Ensure JAVA_ARGS are passed through to the running java application
@@ -23,6 +25,7 @@ Feature: Openshift OpenJDK Runtime tests
   @openjdk
   @ubi8/openjdk-8
   @ubi8/openjdk-11
+  @ubi8/openjdk-17
   @redhat-openjdk-18
   # Not @openj9 yet, we do not set any specific options for it yet
   Scenario: Ensure diagnostic options work correctly
diff --git a/tests/features/openshift.feature b/tests/features/openshift.feature
@@ -1,6 +1,7 @@
 @openjdk
 @ubi8/openjdk-8
 @ubi8/openjdk-11
+@ubi8/openjdk-17
 @redhat-openjdk-18
 Feature: Tests for all openshift images
 
diff --git a/tests/features/prometheus.feature b/tests/features/prometheus.feature
@@ -3,6 +3,7 @@
 @openj9
 @ubi8/openjdk-8
 @ubi8/openjdk-11
+@ubi8/openjdk-17
 Feature: Prometheus agent tests
 
   Scenario: Verify API and defaults
diff --git a/tests/features/s2i-core.feature b/tests/features/s2i-core.feature
@@ -1,6 +1,7 @@
 @openjdk
 @ubi8/openjdk-8
 @ubi8/openjdk-11
+@ubi8/openjdk-17
 @redhat-openjdk-18
 @openj9
 Feature: Openshift S2I tests
