Skip to content

Commit e304a56

Browse files
phracekphracek
committed
Add support for NodeJS-22 imagestreams.
RHEL-9.5.0 reached GA and imagestream is present in registry. The commit allows to test it. Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent 09bf01b commit e304a56

9 files changed

+204
-41
lines changed

‎imagestreams/imagestreams.yaml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
https://github.com/sclorg/s2i-nodejs-container/blob/master/APP_VERSION/README.md.
1010
imagestream_files:
1111
- filename: nodejs-centos.json
12-
latest: "20-ubi9"
12+
latest: "22-ubi9"
1313
distros:
1414
- name: UBI 8
1515
app_versions: ["18", "18-minimal", "20", "20-minimal"]
1616

1717
- name: UBI 9
18-
app_versions: ["18", "18-minimal", "20", "20-minimal"]
18+
app_versions: ["18", "18-minimal", "20", "20-minimal", "22", "22-minimal"]
1919
custom_tags:
2020
- name: "18-ubi8-minimal"
2121
distro: UBI 8
@@ -29,15 +29,18 @@
2929
- name: "20-ubi9-minimal"
3030
distro: UBI 9
3131
app_version: "20-minimal"
32+
- name: "22-ubi9-minimal"
33+
distro: UBI 9
34+
app_version: "22-minimal"
3235

3336
- filename: nodejs-rhel.json
34-
latest: "20-ubi9"
37+
latest: "22-ubi9"
3538
distros:
3639
- name: UBI 8
3740
app_versions: ["18", "18-minimal", "20", "20-minimal"]
3841

3942
- name: UBI 9
40-
app_versions: ["18", "18-minimal", "20", "20-minimal"]
43+
app_versions: ["18", "18-minimal", "20", "20-minimal", "22", "22-minimal"]
4144
# these are non standard tags, maintained for backwards compatibility
4245
custom_tags:
4346
- name: "18-ubi8-minimal"
@@ -52,15 +55,18 @@
5255
- name: "20-ubi9-minimal"
5356
distro: UBI 9
5457
app_version: "20-minimal"
58+
- name: "22-ubi9-minimal"
59+
distro: UBI 9
60+
app_version: "22-minimal"
5561

5662
- filename: nodejs-rhel-aarch64.json
57-
latest: "20-ubi9"
63+
latest: "22-ubi9"
5864
distros:
5965
- name: UBI 8
6066
app_versions: ["18", "18-minimal", "20", "20-minimal"]
6167

6268
- name: UBI 9
63-
app_versions: ["18", "18-minimal", "20", "20-minimal"]
69+
app_versions: ["18", "18-minimal", "20", "20-minimal", "22", "22-minimal"]
6470
custom_tags:
6571
- name: "18-ubi8-minimal"
6672
distro: UBI 8
@@ -74,4 +80,7 @@
7480
- name: "20-ubi9-minimal"
7581
distro: UBI 9
7682
app_version: "20-minimal"
83+
- name: "22-ubi9-minimal"
84+
distro: UBI 9
85+
app_version: "22-minimal"
7786
...

‎imagestreams/nodejs-centos.json‎

Lines changed: 61 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,44 @@
161161
"type": "Local"
162162
}
163163
},
164+
{
165+
"name": "22-ubi9",
166+
"annotations": {
167+
"openshift.io/display-name": "Node.js 22 (UBI 9)",
168+
"openshift.io/provider-display-name": "Red Hat, Inc.",
169+
"description": "Build and run Node.js 22 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/22/README.md.",
170+
"iconClass": "icon-nodejs",
171+
"tags": "builder,nodejs",
172+
"version": "22",
173+
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git"
174+
},
175+
"from": {
176+
"kind": "DockerImage",
177+
"name": "registry.access.redhat.com/ubi9/nodejs-22:latest"
178+
},
179+
"referencePolicy": {
180+
"type": "Local"
181+
}
182+
},
183+
{
184+
"name": "22-minimal-ubi9",
185+
"annotations": {
186+
"openshift.io/display-name": "Node.js 22-minimal (UBI 9)",
187+
"openshift.io/provider-display-name": "Red Hat, Inc.",
188+
"description": "Build and run Node.js 22-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/22-minimal/README.md.",
189+
"iconClass": "icon-nodejs",
190+
"tags": "builder,nodejs",
191+
"version": "22-minimal",
192+
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git"
193+
},
194+
"from": {
195+
"kind": "DockerImage",
196+
"name": "registry.access.redhat.com/ubi9/nodejs-22-minimal:latest"
197+
},
198+
"referencePolicy": {
199+
"type": "Local"
200+
}
201+
},
164202
{
165203
"name": "18-ubi8-minimal",
166204
"annotations": {
@@ -237,20 +275,39 @@
237275
"type": "Local"
238276
}
239277
},
278+
{
279+
"name": "22-ubi9-minimal",
280+
"annotations": {
281+
"openshift.io/display-name": "Node.js 22-minimal (UBI 9)",
282+
"openshift.io/provider-display-name": "Red Hat, Inc.",
283+
"description": "Build and run Node.js 22-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/22-minimal/README.md.",
284+
"iconClass": "icon-nodejs",
285+
"tags": "builder,nodejs",
286+
"version": "22-minimal",
287+
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git"
288+
},
289+
"from": {
290+
"kind": "DockerImage",
291+
"name": "registry.access.redhat.com/ubi9/nodejs-22-minimal:latest"
292+
},
293+
"referencePolicy": {
294+
"type": "Local"
295+
}
296+
},
240297
{
241298
"name": "latest",
242299
"annotations": {
243-
"openshift.io/display-name": "Node.js 20 (Latest)",
300+
"openshift.io/display-name": "Node.js 22 (Latest)",
244301
"openshift.io/provider-display-name": "Red Hat, Inc.",
245-
"description": "Build and run Node.js 20 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
302+
"description": "Build and run Node.js 22 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/22/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
246303
"iconClass": "icon-nodejs",
247304
"tags": "builder,nodejs",
248-
"version": "20",
305+
"version": "22",
249306
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git"
250307
},
251308
"from": {
252309
"kind": "ImageStreamTag",
253-
"name": "20-ubi9"
310+
"name": "22-ubi9"
254311
},
255312
"referencePolicy": {
256313
"type": "Local"

‎imagestreams/nodejs-rhel-aarch64.json‎

Lines changed: 61 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,44 @@
161161
"type": "Local"
162162
}
163163
},
164+
{
165+
"name": "22-ubi9",
166+
"annotations": {
167+
"openshift.io/display-name": "Node.js 22 (UBI 9)",
168+
"openshift.io/provider-display-name": "Red Hat, Inc.",
169+
"description": "Build and run Node.js 22 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/22/README.md.",
170+
"iconClass": "icon-nodejs",
171+
"tags": "builder,nodejs",
172+
"version": "22",
173+
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git"
174+
},
175+
"from": {
176+
"kind": "DockerImage",
177+
"name": "registry.redhat.io/ubi9/nodejs-22:latest"
178+
},
179+
"referencePolicy": {
180+
"type": "Local"
181+
}
182+
},
183+
{
184+
"name": "22-minimal-ubi9",
185+
"annotations": {
186+
"openshift.io/display-name": "Node.js 22-minimal (UBI 9)",
187+
"openshift.io/provider-display-name": "Red Hat, Inc.",
188+
"description": "Build and run Node.js 22-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/22-minimal/README.md.",
189+
"iconClass": "icon-nodejs",
190+
"tags": "builder,nodejs",
191+
"version": "22-minimal",
192+
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git"
193+
},
194+
"from": {
195+
"kind": "DockerImage",
196+
"name": "registry.redhat.io/ubi9/nodejs-22-minimal:latest"
197+
},
198+
"referencePolicy": {
199+
"type": "Local"
200+
}
201+
},
164202
{
165203
"name": "18-ubi8-minimal",
166204
"annotations": {
@@ -237,20 +275,39 @@
237275
"type": "Local"
238276
}
239277
},
278+
{
279+
"name": "22-ubi9-minimal",
280+
"annotations": {
281+
"openshift.io/display-name": "Node.js 22-minimal (UBI 9)",
282+
"openshift.io/provider-display-name": "Red Hat, Inc.",
283+
"description": "Build and run Node.js 22-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/22-minimal/README.md.",
284+
"iconClass": "icon-nodejs",
285+
"tags": "builder,nodejs",
286+
"version": "22-minimal",
287+
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git"
288+
},
289+
"from": {
290+
"kind": "DockerImage",
291+
"name": "registry.redhat.io/ubi9/nodejs-22-minimal:latest"
292+
},
293+
"referencePolicy": {
294+
"type": "Local"
295+
}
296+
},
240297
{
241298
"name": "latest",
242299
"annotations": {
243-
"openshift.io/display-name": "Node.js 20 (Latest)",
300+
"openshift.io/display-name": "Node.js 22 (Latest)",
244301
"openshift.io/provider-display-name": "Red Hat, Inc.",
245-
"description": "Build and run Node.js 20 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
302+
"description": "Build and run Node.js 22 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/22/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
246303
"iconClass": "icon-nodejs",
247304
"tags": "builder,nodejs",
248-
"version": "20",
305+
"version": "22",
249306
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git"
250307
},
251308
"from": {
252309
"kind": "ImageStreamTag",
253-
"name": "20-ubi9"
310+
"name": "22-ubi9"
254311
},
255312
"referencePolicy": {
256313
"type": "Local"

‎imagestreams/nodejs-rhel.json‎

Lines changed: 61 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,44 @@
161161
"type": "Local"
162162
}
163163
},
164+
{
165+
"name": "22-ubi9",
166+
"annotations": {
167+
"openshift.io/display-name": "Node.js 22 (UBI 9)",
168+
"openshift.io/provider-display-name": "Red Hat, Inc.",
169+
"description": "Build and run Node.js 22 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/22/README.md.",
170+
"iconClass": "icon-nodejs",
171+
"tags": "builder,nodejs",
172+
"version": "22",
173+
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git"
174+
},
175+
"from": {
176+
"kind": "DockerImage",
177+
"name": "registry.redhat.io/ubi9/nodejs-22:latest"
178+
},
179+
"referencePolicy": {
180+
"type": "Local"
181+
}
182+
},
183+
{
184+
"name": "22-minimal-ubi9",
185+
"annotations": {
186+
"openshift.io/display-name": "Node.js 22-minimal (UBI 9)",
187+
"openshift.io/provider-display-name": "Red Hat, Inc.",
188+
"description": "Build and run Node.js 22-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/22-minimal/README.md.",
189+
"iconClass": "icon-nodejs",
190+
"tags": "builder,nodejs",
191+
"version": "22-minimal",
192+
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git"
193+
},
194+
"from": {
195+
"kind": "DockerImage",
196+
"name": "registry.redhat.io/ubi9/nodejs-22-minimal:latest"
197+
},
198+
"referencePolicy": {
199+
"type": "Local"
200+
}
201+
},
164202
{
165203
"name": "18-ubi8-minimal",
166204
"annotations": {
@@ -237,20 +275,39 @@
237275
"type": "Local"
238276
}
239277
},
278+
{
279+
"name": "22-ubi9-minimal",
280+
"annotations": {
281+
"openshift.io/display-name": "Node.js 22-minimal (UBI 9)",
282+
"openshift.io/provider-display-name": "Red Hat, Inc.",
283+
"description": "Build and run Node.js 22-minimal applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/22-minimal/README.md.",
284+
"iconClass": "icon-nodejs",
285+
"tags": "builder,nodejs",
286+
"version": "22-minimal",
287+
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git"
288+
},
289+
"from": {
290+
"kind": "DockerImage",
291+
"name": "registry.redhat.io/ubi9/nodejs-22-minimal:latest"
292+
},
293+
"referencePolicy": {
294+
"type": "Local"
295+
}
296+
},
240297
{
241298
"name": "latest",
242299
"annotations": {
243-
"openshift.io/display-name": "Node.js 20 (Latest)",
300+
"openshift.io/display-name": "Node.js 22 (Latest)",
244301
"openshift.io/provider-display-name": "Red Hat, Inc.",
245-
"description": "Build and run Node.js 20 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/20/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
302+
"description": "Build and run Node.js 22 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/22/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
246303
"iconClass": "icon-nodejs",
247304
"tags": "builder,nodejs",
248-
"version": "20",
305+
"version": "22",
249306
"sampleRepo": "https://github.com/sclorg/nodejs-ex.git"
250307
},
251308
"from": {
252309
"kind": "ImageStreamTag",
253-
"name": "20-ubi9"
310+
"name": "22-ubi9"
254311
},
255312
"referencePolicy": {
256313
"type": "Local"

‎test/run-openshift-remote-cluster‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ test -n "${VERSION-}" || false 'make sure $VERSION is defined'
4646
export CT_OCP4_TEST=true
4747
export CT_SKIP_UPLOAD_IMAGE=true
4848

49-
# TODO VERSION 22 is not supported at all
50-
if [ "${VERSION}" == "22" ] || [ "${VERSION}" == "22-minimal" ]; then
51-
exit 0
52-
fi
53-
5449
TEST_SUMMARY=''
5550
TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "openshift-remote-cluster"
5651

‎test/test_latest_imagestreams.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ def setup_method(self):
2222
print(TEST_DIR.parent.parent)
2323

2424
def test_latest_imagestream(self):
25-
# TODO VERSION 22 is not supported at all
26-
if VERSION.startswith("22"):
27-
pass
28-
2925
self.latest_version = self.isc.get_latest_version()
3026
assert self.latest_version != ""
3127
self.isc.check_imagestreams(self.latest_version)

‎test/test_nodejs_ex_templates.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ def teardown_method(self):
4242
]
4343
)
4444
def test_nodejs_ex_template_inside_cluster(self, template):
45-
# TODO VERSION 22 is not supported at all
46-
if VERSION.startswith("22"):
47-
pass
48-
4945
service_name = "nodejs-testing"
5046
template_url = self.oc_api.get_raw_url_for_json(
5147
container="nodejs-ex", dir="openshift/templates", filename=template, branch="master"

‎test/test_shared_helm_nodejs_application.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
class TestHelmNodeJSApplication:
2828

2929
def setup_method(self):
30-
package_name = "nodejs-application"
30+
package_name = "redhat-nodejs-application"
3131
path = test_dir
32-
self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, remote=True)
32+
self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir)
3333
self.hc_api.clone_helm_chart_repo(
3434
repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts",
3535
subdir="charts/redhat"
@@ -39,9 +39,6 @@ def teardown_method(self):
3939
self.hc_api.delete_project()
4040

4141
def test_curl_connection(self):
42-
# TODO VERSION 22 is not supported at all
43-
if VERSION.startswith("22"):
44-
pass
4542
if self.hc_api.oc_api.shared_cluster:
4643
pytest.skip("Do NOT test on shared cluster")
4744
self.hc_api.package_name = "nodejs-imagestreams"
@@ -62,9 +59,6 @@ def test_curl_connection(self):
6259
)
6360

6461
def test_by_helm_test(self):
65-
# TODO VERSION 22 is not supported at all
66-
if VERSION.startswith("22"):
67-
pass
6862
self.hc_api.package_name = "nodejs-imagestreams"
6963
self.hc_api.helm_package()
7064
assert self.hc_api.helm_installation()

0 commit comments

Comments
 (0)