From 3f489d6c22214dcc15226d5905951d270d12e410 Mon Sep 17 00:00:00 2001 From: "D. Paolella" Date: Thu, 5 Dec 2024 10:08:05 +0100 Subject: [PATCH] [4.18] remove -previous ci images --- group.yml | 2 - ...enshift-build-root-previous.rhel8.disabled | 56 ------------------ ...enshift-build-root-previous.rhel9.disabled | 56 ------------------ ...ift-golang-builder-previous.rhel8.disabled | 57 ------------------- ...ift-golang-builder-previous.rhel9.disabled | 56 ------------------ 5 files changed, 227 deletions(-) delete mode 100644 images/ci-openshift-build-root-previous.rhel8.disabled delete mode 100644 images/ci-openshift-build-root-previous.rhel9.disabled delete mode 100644 images/ci-openshift-golang-builder-previous.rhel8.disabled delete mode 100644 images/ci-openshift-golang-builder-previous.rhel9.disabled diff --git a/group.yml b/group.yml index cc0a12fecf..b326df7a37 100644 --- a/group.yml +++ b/group.yml @@ -24,10 +24,8 @@ 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_EXTRA: "1.22" # There is no extra version at this time, so just duplicate latest. - compliance: rpm_shim: enabled: true diff --git a/images/ci-openshift-build-root-previous.rhel8.disabled b/images/ci-openshift-build-root-previous.rhel8.disabled deleted file mode 100644 index f89d52870d..0000000000 --- a/images/ci-openshift-build-root-previous.rhel8.disabled +++ /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-8/ci-openshift-build-root/Dockerfile.previous - git: - branch: - target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift-eng/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-golang-{GO_PREVIOUS}-ci-build-root-multi-openshift-{MAJOR}.{MINOR} -from: - member: ci-openshift-golang-builder-previous.rhel8 -labels: - io.k8s.description: golang {GO_PREVIOUS} build-root image for Red Hat CI -distgit: - branch: rhaos-{MAJOR}.{MINOR}-rhel-8 - component: ci-openshift-build-root-previous-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-build-root-previous-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-previous.rhel9.disabled b/images/ci-openshift-build-root-previous.rhel9.disabled deleted file mode 100644 index c8242bb370..0000000000 --- a/images/ci-openshift-build-root-previous.rhel9.disabled +++ /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-build-root/Dockerfile.previous - git: - branch: - target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift-eng/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_PREVIOUS}-ci-build-root-multi-openshift-{MAJOR}.{MINOR} -from: - member: ci-openshift-golang-builder-previous.rhel9 -labels: - io.k8s.description: golang {GO_PREVIOUS} build-root image for Red Hat CI -distgit: - branch: rhaos-{MAJOR}.{MINOR}-rhel-9 - component: ci-openshift-build-root-previous-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-previous-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.disabled b/images/ci-openshift-golang-builder-previous.rhel8.disabled deleted file mode 100644 index 756819d41a..0000000000 --- a/images/ci-openshift-golang-builder-previous.rhel8.disabled +++ /dev/null @@ -1,57 +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-8/ci-openshift-golang-builder/Dockerfile - git: - branch: - target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift-eng/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-golang-{GO_PREVIOUS}-builder-multi-openshift-{MAJOR}.{MINOR} -from: - stream: rhel-8-golang-{GO_PREVIOUS} -labels: - io.k8s.description: golang {GO_PREVIOUS} builder image for Red Hat CI -distgit: - branch: rhaos-{MAJOR}.{MINOR}-rhel-8 - component: ci-openshift-golang-builder-previous-container - name: ci-openshift-golang-builder-previous - -# 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-golang-builder-previous-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-golang-builder-previous.rhel9.disabled b/images/ci-openshift-golang-builder-previous.rhel9.disabled deleted file mode 100644 index cdb3618643..0000000000 --- a/images/ci-openshift-golang-builder-previous.rhel9.disabled +++ /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-golang-builder/Dockerfile - git: - branch: - target: openshift-{MAJOR}.{MINOR} - url: git@github.com:openshift-priv/ocp-build-data.git - web: https://github.com/openshift-eng/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_PREVIOUS}-builder-multi-openshift-{MAJOR}.{MINOR} -from: - stream: rhel-9-golang-{GO_PREVIOUS} -labels: - io.k8s.description: golang {GO_PREVIOUS} builder image for Red Hat CI -distgit: - branch: rhaos-{MAJOR}.{MINOR}-rhel-9 - component: ci-openshift-golang-builder-previous-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-previous-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: - - '*'