From 82c9991ff308966e1b07b2acab26626c8ee0a55a Mon Sep 17 00:00:00 2001 From: Joep van Delft Date: Mon, 28 Oct 2024 16:30:50 +0100 Subject: [PATCH] 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. --- group.yml | 2 +- images/ci-openshift-base.rhel8.yml | 56 ---------------- ...-openshift-build-root-extra.rhel9.disabled | 59 ---------------- ...nshift-build-root-previous.rhel8.disabled} | 0 ...nshift-build-root-previous.rhel9.disabled} | 0 ...nshift-golang-builder-extra.rhel9.disabled | 59 ---------------- ...ft-golang-builder-previous.rhel8.disabled} | 0 ...ft-golang-builder-previous.rhel9.disabled} | 0 images/openshift-base-rhel8.yml | 41 ------------ images/openshift-enterprise-base.yml | 67 ------------------- streams.yml | 5 -- 11 files changed, 1 insertion(+), 288 deletions(-) delete mode 100644 images/ci-openshift-base.rhel8.yml delete mode 100644 images/ci-openshift-build-root-extra.rhel9.disabled rename images/{ci-openshift-build-root-previous.rhel8.yml => ci-openshift-build-root-previous.rhel8.disabled} (100%) rename images/{ci-openshift-build-root-previous.rhel9.yml => ci-openshift-build-root-previous.rhel9.disabled} (100%) delete mode 100644 images/ci-openshift-golang-builder-extra.rhel9.disabled rename images/{ci-openshift-golang-builder-previous.rhel8.yml => ci-openshift-golang-builder-previous.rhel8.disabled} (100%) rename images/{ci-openshift-golang-builder-previous.rhel9.yml => ci-openshift-golang-builder-previous.rhel9.disabled} (100%) delete mode 100644 images/openshift-base-rhel8.yml delete mode 100644 images/openshift-enterprise-base.yml diff --git a/group.yml b/group.yml index b03c125b39..2450e79118 100644 --- 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 deleted file mode 100644 index b720d9dda7..0000000000 --- a/images/ci-openshift-base.rhel8.yml +++ /dev/null @@ -1,56 +0,0 @@ -content: - # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile. - set_build_variables: true - source: - dockerfile: ci_images/rhel-9/ci-openshift-base/Dockerfile - git: - branch: - target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-eng/ocp-build-data.git - web: https://github.com/openshift/ocp-build-data - ci_alignment: - streams_prs: - enabled: false - mirror: true - mirror_manifest_list: true - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-enterprise-base-multi-openshift-{MAJOR}.{MINOR} -from: - member: openshift-enterprise-base -labels: - io.k8s.description: openshift-enterprise-base-rhel8 for Red Hat CI -distgit: - branch: rhaos-{MAJOR}.{MINOR}-rhel-8 - component: ci-openshift-base-container - -# Repos enabled in the builder image will be ultimately be injected as repos -# in the builder image. This means that engineers who download the image and -# run it connected to the VPN will be able to access the content. This is -# desirable since it allows Dockerfile builds requiring RPMs to work as long -# as the host is connected to the VPN. -enabled_repos: -- rhel-8-baseos-rpms -- rhel-8-appstream-rpms -- rhel-8-server-ose-rpms -- rhel-8-fast-datapath-rpms - -name: openshift/ci-openshift-base-rhel8 -for_payload: false -for_release: false -owners: -- aos-team-art@redhat.com -maintainer: - component: Release - -envs: - # These services run on the build farms and serve RPMs to CI workloads. - # This environment variable is used by dnf_wrapper.sh to know which service - # to acquire repo information from. - CI_RPM_SVC: "base-{MAJOR}-{MINOR}-rhel8.ocp.svc" - -# The from: stanza is exactly what we want to use. So ignore anything in -# the Dockerfile. -canonical_builders_from_upstream: false - -scan_sources: - exempt_rpms: - - '*' diff --git a/images/ci-openshift-build-root-extra.rhel9.disabled b/images/ci-openshift-build-root-extra.rhel9.disabled deleted file mode 100644 index d0596959ba..0000000000 --- a/images/ci-openshift-build-root-extra.rhel9.disabled +++ /dev/null @@ -1,59 +0,0 @@ -# -extra images only need to be enabled when we are dealing with 3 versions of golang in a release -# instead of the normal two. - -content: - # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile. - set_build_variables: true - source: - dockerfile: ci_images/rhel-9/ci-openshift-build-root/Dockerfile - git: - branch: - target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-eng/ocp-build-data.git - web: https://github.com/openshift/ocp-build-data - ci_alignment: - streams_prs: - enabled: false - mirror: true - mirror_manifest_list: true - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_EXTRA}-ci-build-root-multi-openshift-{MAJOR}.{MINOR} -from: - member: ci-openshift-golang-builder-extra.rhel9 -labels: - io.k8s.description: golang {GO_EXTRA} build-root image for Red Hat CI -distgit: - branch: rhaos-{MAJOR}.{MINOR}-rhel-9 - component: ci-openshift-build-root-extra-container - -# Repos enabled in the builder image will be ultimately be injected as repos -# in the builder image. This means that engineers who download the image and -# run it connected to the VPN will be able to access the content. This is -# desirable since it allows Dockerfile builds requiring RPMs to work as long -# as the host is connected to the VPN. -enabled_repos: -- rhel-9-baseos-rpms -- rhel-9-appstream-rpms -- rhel-9-server-ose-rpms -- rhel-9-fast-datapath-rpms - -name: openshift/ci-openshift-build-root-extra-rhel9 -for_payload: false -for_release: false -owners: -- aos-team-art@redhat.com -maintainer: - component: Release - -envs: - # These services run on the build farms and serve RPMs to CI workloads. - # This environment variable is used by dnf_wrapper.sh to know which service - # to acquire repo information from. - CI_RPM_SVC: "base-{MAJOR}-{MINOR}-rhel9.ocp.svc" - -# The from: stanza is exactly what we want to use. So ignore anything in -# the Dockerfile. -canonical_builders_from_upstream: false - -scan_sources: - exempt_rpms: - - '*' diff --git a/images/ci-openshift-build-root-previous.rhel8.yml b/images/ci-openshift-build-root-previous.rhel8.disabled similarity index 100% rename from images/ci-openshift-build-root-previous.rhel8.yml rename to images/ci-openshift-build-root-previous.rhel8.disabled diff --git a/images/ci-openshift-build-root-previous.rhel9.yml b/images/ci-openshift-build-root-previous.rhel9.disabled similarity index 100% rename from images/ci-openshift-build-root-previous.rhel9.yml rename to images/ci-openshift-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 deleted file mode 100644 index 86133d47ba..0000000000 --- a/images/ci-openshift-golang-builder-extra.rhel9.disabled +++ /dev/null @@ -1,59 +0,0 @@ -# -extra images only need to be enabled when we are dealing with 3 versions of golang in a release -# instead of the normal two. - -content: - # set_build_variables is necessary in order to set CI_RPM_SVC (see .envs below) in the Dockerfile. - set_build_variables: true - source: - dockerfile: ci_images/rhel-9/ci-openshift-golang-builder/Dockerfile - git: - branch: - target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-eng/ocp-build-data.git - web: https://github.com/openshift/ocp-build-data - ci_alignment: - streams_prs: - enabled: false - mirror: true - mirror_manifest_list: true - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_EXTRA}-builder-multi-openshift-{MAJOR}.{MINOR} -from: - stream: rhel-9-golang-{GO_EXTRA} -labels: - io.k8s.description: golang {GO_EXTRA} builder image for Red Hat CI -distgit: - branch: rhaos-{MAJOR}.{MINOR}-rhel-9 - component: ci-openshift-golang-builder-extra-container - -# Repos enabled in the builder image will be ultimately be injected as repos -# in the builder image. This means that engineers who download the image and -# run it connected to the VPN will be able to access the content. This is -# desirable since it allows Dockerfile builds requiring RPMs to work as long -# as the host is connected to the VPN. -enabled_repos: -- rhel-9-baseos-rpms -- rhel-9-appstream-rpms -- rhel-9-server-ose-rpms -- rhel-9-fast-datapath-rpms - -name: openshift/ci-openshift-golang-builder-extra-rhel9 -for_payload: false -for_release: false -owners: -- aos-team-art@redhat.com -maintainer: - component: Release - -envs: - # These services run on the build farms and serve RPMs to CI workloads. - # This environment variable is used by dnf_wrapper.sh to know which service - # to acquire repo information from. - CI_RPM_SVC: "base-{MAJOR}-{MINOR}-rhel9.ocp.svc" - -# The from: stanza is exactly what we want to use. So ignore anything in -# the Dockerfile. -canonical_builders_from_upstream: false - -scan_sources: - exempt_rpms: - - '*' diff --git a/images/ci-openshift-golang-builder-previous.rhel8.yml b/images/ci-openshift-golang-builder-previous.rhel8.disabled similarity index 100% rename from images/ci-openshift-golang-builder-previous.rhel8.yml rename to images/ci-openshift-golang-builder-previous.rhel8.disabled diff --git a/images/ci-openshift-golang-builder-previous.rhel9.yml b/images/ci-openshift-golang-builder-previous.rhel9.disabled similarity index 100% rename from images/ci-openshift-golang-builder-previous.rhel9.yml rename to images/ci-openshift-golang-builder-previous.rhel9.disabled diff --git a/images/openshift-base-rhel8.yml b/images/openshift-base-rhel8.yml deleted file mode 100644 index 5b0567a795..0000000000 --- a/images/openshift-base-rhel8.yml +++ /dev/null @@ -1,41 +0,0 @@ -base_only: true -content: - source: - git: - branch: - target: openshift-base-rhel8 - url: git@github.com:openshift-eng/ocp-build-data.git - web: https://github.com/openshift-eng/ocp-build-data - ci_alignment: - streams_prs: - enabled: false - mirror: true - # The upstream_image_base serves as a starting point for the upstream_image. - # ART will mirror the brew build out to upstream_image_base. - # ART does not mirror the upstream_image in this case. A buildconfig, - # generated by images:streams is triggered when upstream_image_base is updated. - # The output of this buildconfig is upstream_image. - # This buildconfig layers on files necessary for the resulting upstream_image CI image - # to pull RPM dependencies from the CDN & reposync repositories. - upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-{MAJOR}.{MINOR}.art - # Note that it must be qualified by {MAJOR}.{MINOR} so that it installs non-CDN - # rpms for the appropriate release. - transform: rhel-8/base-repos - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-{MAJOR}.{MINOR} - okd_alignment: - resolve_as: - stream: centos_stream8 -distgit: - branch: rhaos-{MAJOR}.{MINOR}-rhel-8 - component: openshift-base-rhel8-container -enabled_repos: -- rhel-8-baseos-rpms -- rhel-8-appstream-rpms -for_payload: false -for_release: false -from: - stream: rhel8 -name: openshift/base-rhel8 -owners: -- aos-team-art@redhat.com -canonical_builders_from_upstream: false diff --git a/images/openshift-enterprise-base.yml b/images/openshift-enterprise-base.yml deleted file mode 100644 index 451cd4e22c..0000000000 --- a/images/openshift-enterprise-base.yml +++ /dev/null @@ -1,67 +0,0 @@ -base_only: true -content: - source: - dockerfile: Dockerfile.rhel - git: - branch: - target: release-{MAJOR}.{MINOR} - url: git@github.com:openshift-priv/images.git - web: https://github.com/openshift/images - path: base - ci_alignment: - streams_prs: - # Try to have this PR merge as quickly as possible by pre-approving it. - auto_label: - - approved - - lgtm - merge_first: true - # The OpenShift 4.x:base image used by numerous images in CI. - # The problem is that the actual image is built upstream very infrequently - # (very few changes are made to the openshift/images repo). - # So the "normal" CI promotion logic that updates 4.x:base almost never runs. - # This means that the 4.x:base image diverges over time from the UBI content - # that ART is constantly updating its images with. We want 4.x:base to be - # very similar to what we are using downstream so that CI signal represents - # the downstream product. - mirror: true - # The upstream_image_base serves as a starting point for the upstream_image. - # ART will mirror the brew build out to upstream_image_base. - # ART does not mirror the upstream_image in this case. A buildconfig, - # generated by images:streams is triggered when upstream_image_base is updated. - # The output of this buildconfig is upstream_image. - # This buildconfig layers on files necessary for the resulting upstream_image CI image - # to pull RPM dependencies from the CDN & reposync repositories. - upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-8-openshift-enterprise-base-{MAJOR}.{MINOR}.art - # Note that it must be qualified by {MAJOR}.{MINOR} so that it installs non-CDN - # rpms for the appropriate release. - transform: rhel-8/base-repos - # After the transform, promote directly to the location that CI promotes to. This is - # a little sketchy, but I believe the reward is a significant improvement in CI - # signal fidelity. - upstream_image: registry.ci.openshift.org/ocp/{MAJOR}.{MINOR}:base - okd_alignment: - # The tag name in the okd stream to which this image should be promoted - tag_name: base-stream8 - inject_rpm_repositories: - - id: rhel-8-server-ose - baseurl: http://base-{MAJOR}-{MINOR}-rhel8.ocp.svc/rhel-8-server-ose - -distgit: - branch: rhaos-{MAJOR}.{MINOR}-rhel-8 - component: openshift-enterprise-base-container -enabled_repos: -- rhel-8-baseos-rpms -- rhel-8-appstream-rpms -for_payload: false -for_release: false -from: - member: openshift-base-rhel8 -labels: - License: GPLv2+ - io.k8s.description: This is the base image from which all OpenShift Container Platform images inherit. - io.k8s.display-name: OpenShift Container Platform RHEL 8 Base - io.openshift.tags: openshift,base - vendor: Red Hat -name: openshift/ose-base -owners: -- lmeyer@redhat.com diff --git a/streams.yml b/streams.yml index 671cde86c9..69422c378d 100644 --- 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