Skip to content

Commit 018c324

Browse files
jmtdjmtd
committed
[OPENJDK-3414] Update refs to openjdk-test-applications
The repository has moved: update references. https://issues.redhat.com/browse/OPENJDK-3414 Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 179ce26 commit 018c324

File tree

9 files changed

+30
-30
lines changed

9 files changed

+30
-30
lines changed

‎modules/jvm/tests/features/memory.feature

+1-1
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-container-images/openjdk-test-applications from spring-boot-sample-simple
40+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
4141
Then s2i build log should match regex INFO Using MAVEN_OPTS.*-XX:MaxRAMPercentage=25.0$

‎modules/jvm/tests/features/runtime.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Feature: Openshift OpenJDK Runtime tests
6161

6262
# Builder images only
6363
Scenario: Ensure JAVA_APP_DIR and S2I work together (OPENJDK-2034)
64-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
64+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
6565
| variable | value |
6666
| JAVA_APP_DIR | /home/default |
6767
| S2I_TARGET_DEPLOYMENTS_DIR | /home/default |

‎modules/maven/s2i/tests/features/java_s2i.feature

+18-18
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Feature: Openshift OpenJDK S2I tests
1010

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

2424
# proxy auth configuration (success case) + nonProxyHosts
2525
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
26-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
26+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
2727
| variable | value |
2828
| MAVEN_ARGS | -v |
2929
| http_proxy | myuser:mypass@127.0.0.1:8080 |
@@ -35,7 +35,7 @@ Feature: Openshift OpenJDK S2I tests
3535

3636
# proxy auth configuration (fail case: no password supplied)
3737
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
38-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
38+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
3939
| variable | value |
4040
| MAVEN_ARGS | -v |
4141
| http_proxy | myuser@127.0.0.1:8080 |
@@ -46,7 +46,7 @@ Feature: Openshift OpenJDK S2I tests
4646

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

6060
# HTTP_PROXY (all caps) ignored
6161
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
62-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
62+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
6363
| variable | value |
6464
| MAVEN_ARGS | -v |
6565
| http_proxy | 127.0.0.2:9090 |
@@ -72,7 +72,7 @@ Feature: Openshift OpenJDK S2I tests
7272

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

8686
# https proxy auth configuration (success case) + nonProxyHosts
8787
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
88-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
88+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
8989
| variable | value |
9090
| MAVEN_ARGS | -v |
9191
| https_proxy | myuser:mypass@127.0.0.1:8080 |
@@ -97,7 +97,7 @@ Feature: Openshift OpenJDK S2I tests
9797

9898
# https proxy auth configuration (fail case: no password supplied)
9999
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
100-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
100+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
101101
| variable | value |
102102
| MAVEN_ARGS | -v |
103103
| https_proxy | myuser@127.0.0.1:8080 |
@@ -107,7 +107,7 @@ Feature: Openshift OpenJDK S2I tests
107107
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']
108108

109109
Scenario: run s2i assemble and check no_proxy is honoured with multiple entries
110-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
110+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
111111
| variable | value |
112112
| MAVEN_ARGS | -v |
113113
| MAVEN_MIRROR_URL | http://127.0.0.1:8080/repository/internal/ |
@@ -120,30 +120,30 @@ Feature: Openshift OpenJDK S2I tests
120120

121121
# deprecated?
122122
Scenario: run an S2I build that depends on com.redhat.xpaas.repo.redhatga being defined
123-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
123+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
124124

125125
# deprecated?
126126
Scenario: run an S2I that should fail as MAVEN_ARGS does not define com.redhat.xpaas.repo.redhatga
127-
Given failing s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple using openjdk-enforce-profile
127+
Given failing s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple using openjdk-enforce-profile
128128
| variable | value |
129129
| MAVEN_ARGS | -e package |
130130

131131
# CLOUD-579
132132
Scenario: Test that maven is executed in batch mode
133-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
133+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
134134
Then s2i build log should contain --batch-mode
135135
And s2i build log should not contain \r
136136

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

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

161161
# OPENJDK-1961: MAVEN_REPO_URL and MAVEN_REPO_ID
162162
Scenario: Check MAVEN_REPO_URL generates Maven settings and profile configuration
163-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple/target
163+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple/target
164164
| variable | value |
165165
| MAVEN_REPO_URL | http://repo.example.com:8080/maven2/ |
166166
| MAVEN_REPO_ID | myrepo |
@@ -171,19 +171,19 @@ Feature: Openshift OpenJDK S2I tests
171171
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/']
172172

173173
Scenario: Ensure the environment is cleaned when executing mvn (OPENJDK-1549)
174-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from OPENJDK-1549 with env
174+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from OPENJDK-1549 with env
175175
| variable | value |
176176
| MAVEN_ARGS | validate |
177177

178178
Scenario: Ensure that run-env.sh placed in the JAVA_APP_DIR is sourced in the run script before launching java
179-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
179+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
180180
| variable | value |
181181
| S2I_SOURCE_DATA_DIR | ./ |
182182
| S2I_TARGET_DATA_DIR | /deployments |
183183
Then container log should contain INFO exec -a "someUniqueString" java
184184

185185
Scenario: Ensure mtime is preserved for build artifacts (OPENJDK-2408)
186-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from OPENJDK-2408-bin-custom-s2i-assemble with env
186+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from OPENJDK-2408-bin-custom-s2i-assemble with env
187187
| variable | value |
188188
| S2I_DELETE_SOURCE | false |
189189
Then run find /deployments/spring-boot-sample-simple-1.5.0.BUILD-SNAPSHOT.jar ! -newer /tmp/src/spring-boot-sample-simple-1.5.0.BUILD-SNAPSHOT.jar in container and check its output for spring-boot-sample-simple-1.5.0.BUILD-SNAPSHOT.jar

‎modules/maven/s2i/tests/features/java_s2i_inc.feature

+2-2
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-container-images/openjdk-test-applications from undertow-servlet
8+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git 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-container-images/openjdk-test-applications from undertow-servlet with env and incremental
13+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git 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

‎modules/run/tests/features/java.runtime.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Feature: Openshift OpenJDK Runtime tests (OPENJDK-474)
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-container-images/openjdk-test-applications from undertow-servlet
7+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
88
| variable | value |
99
| JAVA_ARGS | unique |
1010
| JAVA_DIAGNOSTICS | true |

‎modules/run/tests/features/java.security.feature

+1-1
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-container-images/openjdk-test-applications from binary-cli-security-property
6+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from binary-cli-security-property
77
Then s2i build log should contain networkaddress.cache.negative.ttl=0

‎modules/s2i/core/tests/features/java_s2i_quarkus.feature

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
Feature: Openshift OpenJDK S2I tests (Quarkus-based)
66

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

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

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

‎modules/s2i/core/tests/features/s2i-core.feature

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
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-container-images/openjdk-test-applications from spring-boot-sample-simple
7+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from spring-boot-sample-simple
88
Then run stat /tmp/src in container and immediately check its output does not contain File:
99

1010
# OPENJDK-2850 - ensure binary-only s2i doesn't try to change timestamps of
1111
# S2I_TARGET_DEPLOYMENTS_DIR. Use /var/tmp as a directory where attempting to
1212
# will fail. This simulates the s2i process running as a random UID, which can't
1313
# change timestamps on the default directory, /deployments.
1414
Scenario: Ensure binary-only build doesn't fail trying to set timestamp of S2I_TARGET_DEPLOYMENTS_DIR (OPENJDK-2850)
15-
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from OPENJDK-2408-bin-custom-s2i-assemble with env
15+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from OPENJDK-2408-bin-custom-s2i-assemble with env
1616
| variable | value |
1717
| S2I_TARGET_DEPLOYMENTS_DIR | /var/tmp |
1818
Then s2i build log should not contain rsync: [generator] failed to set permissions on "/var/tmp/.": Operation not permitted

‎tests/features/java/ports.feature

+1-1
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-container-images/openjdk-test-applications from undertow-servlet
7+
Given s2i build https://github.com/rh-openjdk/openjdk-container-test-applications.git from undertow-servlet
88
Then check that port 8080 is open
99
Then check that port 8443 is open
1010
Then inspect container

0 commit comments

Comments
 (0)