4.18: Cleanup of artifacts

Cleaning up not needed bits: - remove nodejs from streams.yml. This is rhel9 now. - remove rhel8 base and openshift-enterprise-base image. Nothing consumes from this - disable go1.21 builds. This was already previous in 4.16, no need to carry this on to 4.19 - keep the ci-buildroot images on rhel8. This is probably used in CI.
openshift-eng · Oct 28, 2024 · 82c9991 · 82c9991
1 parent 05c2c77
commit 82c9991
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 288 deletions.
diff --git a/group.yml b/group.yml
@@ -24,7 +24,7 @@ vars:
   #               - rhel-9-golang-{GO_LATEST}
   #               image: openshift/golang-builder:v1.21.3-202401221732.el9.g00c615b
   GO_LATEST: "1.22"
-  GO_PREVIOUS: "1.21"
+  GO_PREVIOUS: "1.22" # There is no previous, duplicate to latest
   GO_EXTRA: "1.22"  # There is no extra version at this time, so just duplicate latest.
 
 

diff --git a/images/ci-openshift-base.rhel8.yml b/images/ci-openshift-base.rhel8.yml
diff --git a/images/ci-openshift-build-root-extra.rhel9.disabled b/images/ci-openshift-build-root-extra.rhel9.disabled
diff --git a/...i-openshift-build-root-previous.rhel8.yml → ...nshift-build-root-previous.rhel8.disabled b/...i-openshift-build-root-previous.rhel8.yml → ...nshift-build-root-previous.rhel8.disabled
diff --git a/...i-openshift-build-root-previous.rhel9.yml → ...nshift-build-root-previous.rhel9.disabled b/...i-openshift-build-root-previous.rhel9.yml → ...nshift-build-root-previous.rhel9.disabled
diff --git a/images/ci-openshift-golang-builder-extra.rhel9.disabled b/images/ci-openshift-golang-builder-extra.rhel9.disabled
diff --git a/...enshift-golang-builder-previous.rhel8.yml → ...ft-golang-builder-previous.rhel8.disabled b/...enshift-golang-builder-previous.rhel8.yml → ...ft-golang-builder-previous.rhel8.disabled
diff --git a/...enshift-golang-builder-previous.rhel9.yml → ...ft-golang-builder-previous.rhel9.disabled b/...enshift-golang-builder-previous.rhel9.yml → ...ft-golang-builder-previous.rhel9.disabled
diff --git a/images/openshift-base-rhel8.yml b/images/openshift-base-rhel8.yml
diff --git a/images/openshift-enterprise-base.yml b/images/openshift-enterprise-base.yml
diff --git a/streams.yml b/streams.yml
@@ -153,11 +153,6 @@ rhel9:
   upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-openshift-{MAJOR}.{MINOR}.art
   mirror: true
 
-nodejs:
-  image: ubi8/nodejs-18:1-71.1697671458
-  upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-openshift-nodejs-base-{MAJOR}.{MINOR}.art
-  mirror: true
-
 nodejs-rhel9:
   image: registry-proxy.engineering.redhat.com/rh-osbs/ubi9-nodejs-18:1-98
   upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-openshift-nodejs-base-{MAJOR}.{MINOR}.art