Skip to content

Commit

Permalink
Merge pull request #521 from jmtd/OPENJDK-3434-refs-openjdk-test-appl…
Browse files Browse the repository at this point in the history
…ications-ubi8

[OPENJDK-3434] update references to openjdk-test-applications [ubi8]
  • Loading branch information
jmtd authored Nov 18, 2024
2 parents bb4ab84 + 093eff0 commit 817061f
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 46 deletions.
4 changes: 2 additions & 2 deletions modules/jolokia/8.2/tests/features/jolokia.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ Feature: Openshift OpenJDK Jolokia tests
Then run sh -c 'jar xf /usr/share/java/jolokia-jvm-agent/jolokia-jvm.jar META-INF/maven/org.jolokia/jolokia-jvm/pom.properties && grep ${JOLOKIA_VERSION} META-INF/maven/org.jolokia/jolokia-jvm/pom.properties' in container and check its output for version=

Scenario: Check jolokia port is available
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
Then check that port 8778 is open
And inspect container
| path | value |
| /Config/ExposedPorts | 8778/tcp |

Scenario: Ensure Jolokia diagnostic options work correctly
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
| variable | value |
| JAVA_ARGS | Hello from CTF test |
| JAVA_DIAGNOSTICS | true |
Expand Down
2 changes: 1 addition & 1 deletion modules/jvm/api/tests/features/memory.feature
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ Feature: OPENJDK-559 JVM Memory tests
@ubi8/openjdk-17
@ubi8/openjdk-21
Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
Then s2i build log should match regex INFO Using MAVEN_OPTS.*-XX:MaxRAMPercentage=25.0$
60 changes: 30 additions & 30 deletions modules/maven/s2i/tests/features/java_s2i.feature

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/maven/s2i/tests/features/java_s2i_inc.feature
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ Feature: Openshift OpenJDK S2I tests

# test incremental builds
Scenario: Check incremental builds cache .m2
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
| variable | value |
| JAVA_ARGS | Hello from CTF test |
Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
And s2i build log should contain Downloading from central:
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet with env and incremental
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet with env and incremental
| variable | value |
| JAVA_ARGS | Hello from CTF test |
Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
Expand Down
2 changes: 1 addition & 1 deletion modules/maven/s2i/tests/features/java_s2i_quarkus.feature
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@ubi8/openjdk-21
Feature: Openshift OpenJDK S2I tests (Quarkus-based)
Scenario: Ensure that run-env.sh placed in the JAVA_APP_DIR is sourced in the run script before launching java
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
| variable | value |
| S2I_SOURCE_DATA_DIR | ./ |
| S2I_TARGET_DATA_DIR | /deployments |
Expand Down
6 changes: 3 additions & 3 deletions modules/run/tests/features/java.runtime.feature
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ Feature: Openshift OpenJDK Runtime tests
| JAVA_APP_DIR | /nope |
Then available container log should contain ERROR No directory /nope found for auto detection
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
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git 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
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git 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
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
| variable | value |
| JAVA_ARGS | Hello from CTF test |
| JAVA_DIAGNOSTICS | true |
Expand Down
2 changes: 1 addition & 1 deletion modules/run/tests/features/java.security.feature
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
@ubi8/openjdk-21
Feature: Openshift S2I tests
Scenario: Check networkaddress.cache.negative.ttl has been set correctly
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from binary-cli-security-property
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from binary-cli-security-property
Then s2i build log should contain networkaddress.cache.negative.ttl=0
6 changes: 3 additions & 3 deletions modules/s2i/core/api/tests/features/java_s2i_quarkus.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
Feature: Openshift OpenJDK S2I tests (Quarkus-based)

Scenario: Ensure Quarkus CDS doesn't fail due to timestamp mismatch (OPENDJK-1673)
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from getting-started
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from getting-started
Then container log should not contain A jar file is not the one used while building the shared archive file

Scenario: quarkus fast-jar layout works out-of-the-box (OPENJDK-1957)
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
Then container log should contain INFO quarkus fast-jar package type detected
And container log should contain -jar /deployments/quarkus-app/quarkus-run.jar
And container log should contain (main) getting-started 1.0.0-SNAPSHOT on JVM (powered by Quarkus
Expand All @@ -18,7 +18,7 @@ Feature: Openshift OpenJDK S2I tests (Quarkus-based)
And container log should not contain no main manifest attribute

Scenario: quarkus uber-jar layout works out-of-the-box (OPENJDK-1957)
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i with env
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i with env
| variable | value |
| QUARKUS_PACKAGE_TYPE | uber-jar |
Then container log should not contain INFO quarkus fast-jar package type detected
Expand Down
4 changes: 2 additions & 2 deletions modules/s2i/core/api/tests/features/s2i-core.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
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
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
Then run stat /tmp/src in container and immediately check its output does not contain File:

# OPENJDK-2824 - ensure binary-only s2i doesn't try to change timestamps of
# S2I_TARGET_DEPLOYMENTS_DIR. Use /var/tmp as a directory where attempting to
# will fail. This simulates the s2i process running as a random UID, which can't
# change timestamps on the default directory, /deployments.
Scenario: Ensure binary-only build doesn't fail trying to set timestamp of S2I_TARGET_DEPLOYMENTS_DIR (OPENJDK-2850)
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from OPENJDK-2408-bin-custom-s2i-assemble with env
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from OPENJDK-2408-bin-custom-s2i-assemble with env
| variable | value |
| S2I_TARGET_DEPLOYMENTS_DIR | /var/tmp |
Then s2i build log should not contain rsync: [generator] failed to set permissions on "/var/tmp/.": Operation not permitted
Expand Down
2 changes: 1 addition & 1 deletion tests/features/java/ports.feature
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@ubi8/openjdk-21
Feature: Openshift OpenJDK port tests
Scenario: Check ports are available
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
Then check that port 8080 is open
Then check that port 8443 is open
Then inspect container
Expand Down

0 comments on commit 817061f

Please sign in to comment.