Split the tests inside tests/features/java/runtime.feature to couple …

…them with appropriate modules Signed-off-by: Jayashree Huttanagoudar <[email protected]>
rh-openjdk · Mar 15, 2024 · 2842ed4 · 2842ed4
1 parent 1c3b4ad
commit 2842ed4
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 25 deletions.
diff --git a/tests/features/java/runtime.feature → ...es/jvm/api/tests/features/runtime.feature b/tests/features/java/runtime.feature → ...es/jvm/api/tests/features/runtime.feature
@@ -2,31 +2,7 @@
 @ubi8/openjdk-11
 @ubi8/openjdk-17
 @ubi8/openjdk-21
-Feature: Openshift OpenJDK Runtime tests
-  Scenario: Ensure JVM_ARGS is no longer present in the run script
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
-    Then file /usr/local/s2i/run should not contain JVM_ARGS
-
-  Scenario: Ensure JAVA_ARGS are passed through to the running java application
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
-       | variable    | value               |
-       | JAVA_ARGS   | Hello from CTF test |
-    Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
-
-  Scenario: Ensure diagnostic options work correctly
-    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
-       | variable         | value               |
-       | JAVA_ARGS        | Hello from CTF test |
-       | JAVA_DIAGNOSTICS | true                |
-    Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
-      And container log should contain -XX:NativeMemoryTracking=summary
-
-  @ubi8
-  Scenario: OPENJDK-474 to ensure JAVA_ARGS is not duplicated in the java command line
-    Given container is started with env
-    | variable  | value  |
-    | JAVA_ARGS | unique |
-  Then container log should not contain unique unique
+Feature: OpenJDK Runtime tests 
 
   @ubi8
   Scenario: Check JAVA_APP_NAME can contain spaces (OPENJDK-104)

diff --git a/modules/run/tests/features/java.runtime.feature b/modules/run/tests/features/java.runtime.feature
@@ -0,0 +1,29 @@
+@ubi8/openjdk-8
+@ubi8/openjdk-11
+@ubi8/openjdk-17
+@ubi8/openjdk-21
+Feature: Openshift OpenJDK Runtime tests
+  Scenario: Ensure JVM_ARGS is no longer present in the run script
+    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
+    Then file /usr/local/s2i/run should not contain JVM_ARGS
+
+  Scenario: Ensure JAVA_ARGS are passed through to the running java application
+    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
+       | variable    | value               |
+       | JAVA_ARGS   | Hello from CTF test |
+    Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
+
+  Scenario: Ensure diagnostic options work correctly
+    Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
+       | variable         | value               |
+       | JAVA_ARGS        | Hello from CTF test |
+       | JAVA_DIAGNOSTICS | true                |
+    Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
+      And container log should contain -XX:NativeMemoryTracking=summary
+
+  @ubi8
+  Scenario: OPENJDK-474 to ensure JAVA_ARGS is not duplicated in the java command line
+    Given container is started with env
+    | variable  | value  |
+    | JAVA_ARGS | unique |
+  Then container log should not contain unique unique