Skip to content

Commit 6934255

Browse files
authored
Merge pull request #420 from jhuttana/OPENJDK-2428
[OPENJDK-2428] Test coverage for user-provided run-env.sh and Update test URI to refer new application source repo
2 parents 5696b63 + 779d6fd commit 6934255

File tree

9 files changed

+52
-47
lines changed

9 files changed

+52
-47
lines changed

tests/features/java.security.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
@ubi8/openjdk-21
55
Feature: Openshift S2I tests
66
Scenario: Check networkaddress.cache.negative.ttl has been set correctly
7-
Given s2i build https://github.com/jboss-openshift/openshift-examples/ from binary-cli-security-property
7+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from binary-cli-security-property
88
Then s2i build log should contain networkaddress.cache.negative.ttl=0

tests/features/java/java_s2i.feature

Lines changed: 36 additions & 29 deletions
Large diffs are not rendered by default.

tests/features/java/java_s2i_inc.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ Feature: Openshift OpenJDK S2I tests
66

77
# test incremental builds
88
Scenario: Check incremental builds cache .m2
9-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
9+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
1010
| variable | value |
1111
| JAVA_ARGS | Hello from CTF test |
1212
Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
1313
And s2i build log should contain Downloading from central:
14-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet with env and incremental
14+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet with env and incremental
1515
| variable | value |
1616
| JAVA_ARGS | Hello from CTF test |
1717
Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test

tests/features/java/memory.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ Feature: OPENJDK-559 JVM Memory tests
6262
@ubi8/openjdk-17
6363
@ubi8/openjdk-21
6464
Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
65-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
65+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
6666
Then s2i build log should match regex INFO Using MAVEN_OPTS.*-XX:MaxRAMPercentage=25.0$

tests/features/java/openjdk_s2i.feature

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ Feature: Openshift OpenJDK-only S2I tests
66

77
@ubi8/openjdk-8
88
Scenario: Check java perf dir owned by jboss (CLOUD-2070)
9-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
9+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
1010
Then run jstat -gc 1 1000 1 in container and check its output for S0C
1111
And run stat --printf="%U %G" /tmp/hsperfdata_jboss/ in container and check its output for jboss root
1212

1313
Scenario: Ensure Quarkus CDS doesn't fail due to timestamp mismatch (OPENDJK-1673)
14-
Given s2i build https://github.com/jerboaa/quarkus-quickstarts from getting-started using quickstart-2.16-s2i-cds
14+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from getting-started
1515
Then container log should not contain A jar file is not the one used while building the shared archive file
1616

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

2626
Scenario: quarkus uber-jar layout works out-of-the-box (OPENJDK-1957)
27-
Given s2i build https://github.com/jmtd/openshift-quickstarts from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i with env using OPENJDK-631-quarkus-fast-jar
27+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i with env
2828
| variable | value |
2929
| QUARKUS_PACKAGE_TYPE | uber-jar |
3030
Then container log should not contain INFO quarkus fast-jar package type detected

tests/features/java/ports.feature

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
@ubi8/openjdk-17
44
@ubi8/openjdk-21
55
Feature: Openshift OpenJDK port tests
6-
76
Scenario: Check ports are available
8-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
7+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
98
Then check that port 8080 is open
109
Then check that port 8443 is open
1110
Then inspect container

tests/features/java/runtime.feature

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@
33
@ubi8/openjdk-17
44
@ubi8/openjdk-21
55
Feature: Openshift OpenJDK Runtime tests
6-
76
Scenario: Ensure JVM_ARGS is no longer present in the run script
8-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
7+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
98
Then file /usr/local/s2i/run should not contain JVM_ARGS
109

1110
Scenario: Ensure JAVA_ARGS are passed through to the running java application
12-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
11+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
1312
| variable | value |
1413
| JAVA_ARGS | Hello from CTF test |
1514
Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
1615

1716
Scenario: Ensure diagnostic options work correctly
18-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
17+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
1918
| variable | value |
2019
| JAVA_ARGS | Hello from CTF test |
2120
| JAVA_DIAGNOSTICS | true |

tests/features/jolokia.feature

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
Feature: Openshift OpenJDK Jolokia tests
33

44
Scenario: Check Environment variable is correct
5-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
5+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
66
Then run sh -c 'unzip -q -p /usr/share/java/jolokia-jvm-agent/jolokia-jvm.jar META-INF/maven/org.jolokia/jolokia-jvm/pom.properties | grep -F ${JOLOKIA_VERSION}' in container and check its output for version=
77

88
@ubi8/openjdk-8
99
@ubi8/openjdk-11
1010
Scenario: Check jolokia port is available
11-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
11+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
1212
Then check that port 8778 is open
1313
And inspect container
1414
| path | value |
@@ -17,7 +17,7 @@ Feature: Openshift OpenJDK Jolokia tests
1717
@ubi8/openjdk-8
1818
@ubi8/openjdk-11
1919
Scenario: Ensure Jolokia diagnostic options work correctly
20-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
20+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
2121
| variable | value |
2222
| JAVA_ARGS | Hello from CTF test |
2323
| JAVA_DIAGNOSTICS | true |

tests/features/s2i-core.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
Feature: Openshift S2I tests
66
# OPENJDK-84 - /tmp/src should not be present after build
77
Scenario: run an s2i build and check that /tmp/src has been removed afterwards
8-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
8+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
99
Then run stat /tmp/src in container and immediately check its output does not contain File:

0 commit comments

Comments
 (0)