Skip to content

Commit f76f097

Browse files
jmtdjmtd
authored
Merge pull request #419 from jhuttana/update_tests_to_refer_new_app_repo
[OPENJDK-2199] Update tests URI to refer to new application source repository
2 parents 0a2e55e + b671ce3 commit f76f097

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

‎tests/features/java.security.feature

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

‎tests/features/java/java_s2i.feature

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Feature: Openshift OpenJDK S2I tests
88

99
# handles mirror/repository configuration; proxy configuration
1010
Scenario: run the s2i and check the maven mirror and proxy have been initialised in the default settings.xml, uses http_proxy
11-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
11+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
1212
| variable | value |
1313
| MAVEN_ARGS | -v |
1414
| MAVEN_MIRROR_URL | http://127.0.0.1:8080/repository/internal/ |
@@ -21,7 +21,7 @@ Feature: Openshift OpenJDK S2I tests
2121

2222
# proxy auth configuration (success case) + nonProxyHosts
2323
Scenario: run the s2i and check the maven mirror, proxy (including username and password) and non proxy have been initialised in the default settings.xml, uses http_proxy
24-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
24+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
2525
| variable | value |
2626
| MAVEN_ARGS | -v |
2727
| http_proxy | myuser:mypass@127.0.0.1:8080 |
@@ -33,7 +33,7 @@ Feature: Openshift OpenJDK S2I tests
3333

3434
# proxy auth configuration (fail case: no password supplied)
3535
Scenario: run the s2i and check the maven mirror, proxy (including username) and non proxy have been initialised in the default settings.xml, uses http_proxy
36-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
36+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
3737
| variable | value |
3838
| MAVEN_ARGS | -v |
3939
| http_proxy | myuser@127.0.0.1:8080 |
@@ -44,7 +44,7 @@ Feature: Openshift OpenJDK S2I tests
4444

4545
# handles mirror/repository configuration; proxy configuration
4646
Scenario: run the s2i and check the maven mirror and proxy have been initialised in the default settings.xml, uses http_proxy
47-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
47+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
4848
| variable | value |
4949
| MAVEN_ARGS | -v |
5050
| MAVEN_MIRROR_URL | http://127.0.0.1:8080/repository/internal/ |
@@ -57,7 +57,7 @@ Feature: Openshift OpenJDK S2I tests
5757

5858
# HTTP_PROXY (all caps) ignored
5959
Scenario: run the s2i and check the maven mirror and proxy have been initialised in the default settings.xml, uses http_proxy and HTTP_PROXY
60-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
60+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
6161
| variable | value |
6262
| MAVEN_ARGS | -v |
6363
| http_proxy | 127.0.0.2:9090 |
@@ -70,7 +70,7 @@ Feature: Openshift OpenJDK S2I tests
7070

7171
# handles mirror/repository configuration; https proxy configuration
7272
Scenario: run the s2i and check the maven mirror and proxy have been initialised in the default settings.xml, uses https_proxy
73-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
73+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
7474
| variable | value |
7575
| MAVEN_ARGS | -v |
7676
| MAVEN_MIRROR_URL | http://127.0.0.1:8080/repository/internal/ |
@@ -83,7 +83,7 @@ Feature: Openshift OpenJDK S2I tests
8383

8484
# https proxy auth configuration (success case) + nonProxyHosts
8585
Scenario: run the s2i and check the maven mirror, proxy (including username and password) and non proxy have been initialised in the default settings.xml, uses https_proxy
86-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
86+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
8787
| variable | value |
8888
| MAVEN_ARGS | -v |
8989
| https_proxy | myuser:mypass@127.0.0.1:8080 |
@@ -95,7 +95,7 @@ Feature: Openshift OpenJDK S2I tests
9595

9696
# https proxy auth configuration (fail case: no password supplied)
9797
Scenario: run the s2i and check the maven mirror, proxy (including username) and non proxy have been initialised in the default settings.xml, uses https_proxy
98-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
98+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
9999
| variable | value |
100100
| MAVEN_ARGS | -v |
101101
| https_proxy | myuser@127.0.0.1:8080 |
@@ -105,7 +105,7 @@ Feature: Openshift OpenJDK S2I tests
105105
Then XML file /tmp/artifacts/configuration/settings.xml should have 1 elements on XPath //ns:proxy[ns:id='genproxy'][ns:active='true'][ns:protocol='https'][ns:host='127.0.0.1'][ns:port='8080']
106106

107107
Scenario: run s2i assemble and check no_proxy is honoured with multiple entries
108-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
108+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
109109
| variable | value |
110110
| MAVEN_ARGS | -v |
111111
| MAVEN_MIRROR_URL | http://127.0.0.1:8080/repository/internal/ |
@@ -128,20 +128,20 @@ Feature: Openshift OpenJDK S2I tests
128128

129129
# CLOUD-579
130130
Scenario: Test that maven is executed in batch mode
131-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
131+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
132132
Then s2i build log should contain --batch-mode
133133
And s2i build log should not contain \r
134134

135135
# CLOUD-3095 - context dir should be recursively copied into the image
136136
# "/target" suffix is important here; it triggers a different code-path (no source build)
137137
Scenario: Ensure binary-only mode copies binaries into the target image
138-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple/target
138+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple/target
139139
Then s2i build log should not contain skipping directory .
140140
And run find /deployments in container and check its output for spring-boot-sample-simple-1.5.0.BUILD-SNAPSHOT.jar
141141

142142
# OPENJDK-1954 - MAVEN_REPOS
143143
Scenario: run the s2i and check the maven mirror and proxy have been initialised in the default settings.xml, uses http_proxy
144-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple/target
144+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple/target
145145
| variable | value |
146146
| MAVEN_REPOS | TESTREPO,ANOTHER |
147147
| TESTREPO_MAVEN_REPO_URL | http://repo.example.com:8080/maven2/ |
@@ -158,7 +158,7 @@ Feature: Openshift OpenJDK S2I tests
158158

159159
# OPENJDK-1961: MAVEN_REPO_URL and MAVEN_REPO_ID
160160
Scenario: Check MAVEN_REPO_URL generates Maven settings and profile configuration
161-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple/target
161+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple/target
162162
| variable | value |
163163
| MAVEN_REPO_URL | http://repo.example.com:8080/maven2/ |
164164
| MAVEN_REPO_ID | myrepo |
@@ -169,7 +169,7 @@ Feature: Openshift OpenJDK S2I tests
169169
Then XML file /tmp/artifacts/configuration/settings.xml should have 1 elements on XPath //ns:profile[ns:id='myrepo-profile']/ns:repositories/ns:repository[ns:url='http://repo.example.com:8080/maven2/']
170170

171171
Scenario: Ensure the environment is cleaned when executing mvn (OPENJDK-1549)
172-
Given s2i build https://github.com/jboss-container-images/openjdk from tests/OPENJDK-1549 with env using ubi9
172+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from OPENJDK-1549 with env
173173
| variable | value |
174174
| MAVEN_ARGS | validate |
175175

‎tests/features/java/java_s2i_inc.feature

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

66
# test incremental builds
77
Scenario: Check incremental builds cache .m2
8-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
8+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
99
| variable | value |
1010
| JAVA_ARGS | Hello from CTF test |
1111
Then container log should contain /deployments/undertow-servlet.jar Hello from CTF test
1212
And s2i build log should contain Downloading from central:
13-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet with env and incremental
13+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet with env and incremental
1414
| variable | value |
1515
| JAVA_ARGS | Hello from CTF test |
1616
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
@@ -37,5 +37,5 @@ Feature: OPENJDK-559 JVM Memory tests
3737
@ubi9/openjdk-17
3838
@ubi9/openjdk-21
3939
Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
40-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
40+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
4141
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
@@ -4,16 +4,16 @@
44
@ubi9/openjdk-21
55
Feature: Openshift OpenJDK-only S2I tests
66
Scenario: Check java perf dir owned by default (CLOUD-2070, OPENJDK-91)
7-
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
88
Then run jstat -gc 1 1000 1 in container and check its output for S0C
99
And run stat --printf="%U %G" /tmp/hsperfdata_default/ in container and check its output for default root
1010

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

1515
Scenario: quarkus fast-jar layout works out-of-the-box (OPENJDK-631)
16-
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
16+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
1717
Then container log should contain INFO quarkus fast-jar package type detected
1818
And container log should contain -jar /deployments/quarkus-app/quarkus-run.jar
1919
And container log should contain (main) getting-started 1.0.0-SNAPSHOT on JVM (powered by Quarkus
@@ -22,7 +22,7 @@ Feature: Openshift OpenJDK-only S2I tests
2222
And container log should not contain no main manifest attribute
2323

2424
Scenario: quarkus uber-jar layout works out-of-the-box (OPENJDK-631)
25-
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
25+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i with env
2626
| variable | value |
2727
| QUARKUS_PACKAGE_TYPE | uber-jar |
2828
Then container log should not contain INFO quarkus fast-jar package type detected

‎tests/features/java/ports.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Feature: Openshift OpenJDK port tests
55

66
Scenario: Check ports are available
7-
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
88
Then check that port 8080 is open
99
Then check that port 8443 is open
1010
Then inspect container

‎tests/features/java/runtime.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Feature: Openshift OpenJDK Runtime tests
55

66
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-openshift/openshift-quickstarts from undertow-servlet
7+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
88
| variable | value |
99
| JAVA_ARGS | unique |
1010
| JAVA_DIAGNOSTICS | true |
@@ -71,7 +71,7 @@ Feature: Openshift OpenJDK Runtime tests
7171

7272
# Builder images only
7373
Scenario: Ensure JAVA_APP_DIR and S2I work together (OPENJDK-2034)
74-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
74+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
7575
| variable | value |
7676
| JAVA_APP_DIR | /home/default |
7777
| S2I_TARGET_DEPLOYMENTS_DIR | /home/default |

‎tests/features/s2i-core.feature

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

0 commit comments

Comments
 (0)