Skip to content

Commit

Permalink
Merge pull request #464 from jhuttana/ubi9-runtime-feature
Browse files Browse the repository at this point in the history
[OPENJDK-2177] Split the tests inside tests/features/java/runtime.feature to couple them with appropriate modules
  • Loading branch information
jmtd authored Mar 18, 2024
2 parents 60ca966 + 41f8baf commit 74a6ebc
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@
@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
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
| variable | value |
| JAVA_ARGS | unique |
| JAVA_DIAGNOSTICS | true |
Then container log should contain /deployments/undertow-servlet.jar unique
And container log should contain -XX:NativeMemoryTracking=summary
And file /usr/local/s2i/run should not contain JVM_ARGS
And container log should not contain unique unique

@ubi9
Scenario: Check JAVA_OPTS overrides defaults
Given container is started with env
Expand Down
14 changes: 14 additions & 0 deletions modules/run/tests/features/java.runtime.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@ubi9/openjdk-11
@ubi9/openjdk-17
@ubi9/openjdk-21
Feature: Openshift OpenJDK Runtime tests (OPENJDK-474)

Scenario: Ensure JAVA_ARGS is passed through, diagnostic options work correctly, JVM_ARGS not present in run script, OPENJDK-474 JAVA_ARGS not repeated
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
| variable | value |
| JAVA_ARGS | unique |
| JAVA_DIAGNOSTICS | true |
Then container log should contain /deployments/undertow-servlet.jar unique
And container log should contain -XX:NativeMemoryTracking=summary
And file /usr/local/s2i/run should not contain JVM_ARGS
And container log should not contain unique unique

0 comments on commit 74a6ebc

Please sign in to comment.