Skip to content

Commit 74a6ebc

Browse files
authored
Merge pull request #464 from jhuttana/ubi9-runtime-feature
[OPENJDK-2177] Split the tests inside tests/features/java/runtime.feature to couple them with appropriate modules
2 parents 60ca966 + 41f8baf commit 74a6ebc

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

tests/features/java/runtime.feature renamed to modules/jvm/tests/features/runtime.feature

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@
33
@ubi9/openjdk-21
44
Feature: Openshift OpenJDK Runtime tests
55

6-
Scenario: Ensure JAVA_ARGS is passed through, diagnostic options work correctly, JVM_ARGS not present in run script, OPENJDK-474 JAVA_ARGS not repeated
7-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
8-
| variable | value |
9-
| JAVA_ARGS | unique |
10-
| JAVA_DIAGNOSTICS | true |
11-
Then container log should contain /deployments/undertow-servlet.jar unique
12-
And container log should contain -XX:NativeMemoryTracking=summary
13-
And file /usr/local/s2i/run should not contain JVM_ARGS
14-
And container log should not contain unique unique
15-
166
@ubi9
177
Scenario: Check JAVA_OPTS overrides defaults
188
Given container is started with env
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
@ubi9/openjdk-11
2+
@ubi9/openjdk-17
3+
@ubi9/openjdk-21
4+
Feature: Openshift OpenJDK Runtime tests (OPENJDK-474)
5+
6+
Scenario: Ensure JAVA_ARGS is passed through, diagnostic options work correctly, JVM_ARGS not present in run script, OPENJDK-474 JAVA_ARGS not repeated
7+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
8+
| variable | value |
9+
| JAVA_ARGS | unique |
10+
| JAVA_DIAGNOSTICS | true |
11+
Then container log should contain /deployments/undertow-servlet.jar unique
12+
And container log should contain -XX:NativeMemoryTracking=summary
13+
And file /usr/local/s2i/run should not contain JVM_ARGS
14+
And container log should not contain unique unique

0 commit comments

Comments
 (0)