Skip to content

Commit b702622

Browse files
jmtdjmtd
authored
Merge pull request #405 from jhuttana/update_application_source_uri
[OPENJDK-2199] Update tests to refer new application source repository
2 parents 02aa162 + 490fbd1 commit b702622

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
@@ -2,5 +2,5 @@
22
@ubi9/openjdk-17
33
Feature: Openshift S2I tests
44
Scenario: Check networkaddress.cache.negative.ttl has been set correctly
5-
Given s2i build https://github.com/jboss-openshift/openshift-examples/ from binary-cli-security-property
5+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from binary-cli-security-property
66
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
@@ -7,7 +7,7 @@ Feature: Openshift OpenJDK S2I tests
77

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

2121
# proxy auth configuration (success case) + nonProxyHosts
2222
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
23-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
23+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
2424
| variable | value |
2525
| MAVEN_ARGS | -v |
2626
| http_proxy | myuser:mypass@127.0.0.1:8080 |
@@ -32,7 +32,7 @@ Feature: Openshift OpenJDK S2I tests
3232

3333
# proxy auth configuration (fail case: no password supplied)
3434
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
35-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
35+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
3636
| variable | value |
3737
| MAVEN_ARGS | -v |
3838
| http_proxy | myuser@127.0.0.1:8080 |
@@ -43,7 +43,7 @@ Feature: Openshift OpenJDK S2I tests
4343

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

5757
# HTTP_PROXY (all caps) ignored
5858
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
59-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
59+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
6060
| variable | value |
6161
| MAVEN_ARGS | -v |
6262
| http_proxy | 127.0.0.2:9090 |
@@ -69,7 +69,7 @@ Feature: Openshift OpenJDK S2I tests
6969

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

8383
# https proxy auth configuration (success case) + nonProxyHosts
8484
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
85-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
85+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
8686
| variable | value |
8787
| MAVEN_ARGS | -v |
8888
| https_proxy | myuser:mypass@127.0.0.1:8080 |
@@ -94,7 +94,7 @@ Feature: Openshift OpenJDK S2I tests
9494

9595
# https proxy auth configuration (fail case: no password supplied)
9696
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
97-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
97+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
9898
| variable | value |
9999
| MAVEN_ARGS | -v |
100100
| https_proxy | myuser@127.0.0.1:8080 |
@@ -104,7 +104,7 @@ Feature: Openshift OpenJDK S2I tests
104104
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']
105105

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

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

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

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

158158
# OPENJDK-1961: MAVEN_REPO_URL and MAVEN_REPO_ID
159159
Scenario: Check MAVEN_REPO_URL generates Maven settings and profile configuration
160-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple/target
160+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple/target
161161
| variable | value |
162162
| MAVEN_REPO_URL | http://repo.example.com:8080/maven2/ |
163163
| MAVEN_REPO_ID | myrepo |
@@ -168,6 +168,6 @@ Feature: Openshift OpenJDK S2I tests
168168
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/']
169169

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

‎tests/features/java/java_s2i_inc.feature

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

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

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

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

2323
Scenario: quarkus uber-jar layout works out-of-the-box (OPENJDK-631)
24-
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
24+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i with env
2525
| variable | value |
2626
| QUARKUS_PACKAGE_TYPE | uber-jar |
2727
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
@@ -3,7 +3,7 @@
33
Feature: Openshift OpenJDK port tests
44

55
Scenario: Check ports are available
6-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
6+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
77
Then check that port 8080 is open
88
Then check that port 8443 is open
99
Then inspect container

‎tests/features/java/runtime.feature

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

55
Scenario: Ensure JAVA_ARGS is passed through, diagnostic options work correctly, JVM_ARGS not present in run script, OPENJDK-474 JAVA_ARGS not repeated
6-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
6+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
77
| variable | value |
88
| JAVA_ARGS | unique |
99
| JAVA_DIAGNOSTICS | true |
@@ -70,7 +70,7 @@ Feature: Openshift OpenJDK Runtime tests
7070

7171
# Builder images only
7272
Scenario: Ensure JAVA_APP_DIR and S2I work together (OPENJDK-2034)
73-
Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from undertow-servlet
73+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from undertow-servlet
7474
| variable | value |
7575
| JAVA_APP_DIR | /home/default |
7676
| 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
@@ -3,5 +3,5 @@
33
Feature: Openshift S2I tests
44
# OPENJDK-84 - /tmp/src should not be present after build
55
Scenario: run an s2i build and check that /tmp/src has been removed afterwards
6-
Given s2i build https://github.com/jboss-openshift/openshift-examples from spring-boot-sample-simple
6+
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
77
Then run stat /tmp/src in container and immediately check its output does not contain File:

0 commit comments

Comments
 (0)