From c3f34fc17f82842d78c30184f1bf3c218d6e7445 Mon Sep 17 00:00:00 2001 From: Joep van Delft Date: Tue, 26 Nov 2024 08:44:39 +0100 Subject: [PATCH] Start relying on ci base image for CI follow-up of https://github.com/openshift-eng/ocp-build-data/pull/5618 --- ... => ci-openshift-build-root-previous.rhel8.yml} | 0 ... => ci-openshift-build-root-previous.rhel9.yml} | 0 ...ci-openshift-golang-builder-previous.rhel8.yml} | 0 ...ci-openshift-golang-builder-previous.rhel9.yml} | 0 images/openshift-base-rhel9.yml | 14 +------------- 5 files changed, 1 insertion(+), 13 deletions(-) rename images/{ci-openshift-build-root-previous.rhel8 => ci-openshift-build-root-previous.rhel8.yml} (100%) rename images/{ci-openshift-build-root-previous.rhel9 => ci-openshift-build-root-previous.rhel9.yml} (100%) rename images/{ci-openshift-golang-builder-previous.rhel8 => ci-openshift-golang-builder-previous.rhel8.yml} (100%) rename images/{ci-openshift-golang-builder-previous.rhel9 => ci-openshift-golang-builder-previous.rhel9.yml} (100%) diff --git a/images/ci-openshift-build-root-previous.rhel8 b/images/ci-openshift-build-root-previous.rhel8.yml similarity index 100% rename from images/ci-openshift-build-root-previous.rhel8 rename to images/ci-openshift-build-root-previous.rhel8.yml diff --git a/images/ci-openshift-build-root-previous.rhel9 b/images/ci-openshift-build-root-previous.rhel9.yml similarity index 100% rename from images/ci-openshift-build-root-previous.rhel9 rename to images/ci-openshift-build-root-previous.rhel9.yml diff --git a/images/ci-openshift-golang-builder-previous.rhel8 b/images/ci-openshift-golang-builder-previous.rhel8.yml similarity index 100% rename from images/ci-openshift-golang-builder-previous.rhel8 rename to images/ci-openshift-golang-builder-previous.rhel8.yml diff --git a/images/ci-openshift-golang-builder-previous.rhel9 b/images/ci-openshift-golang-builder-previous.rhel9.yml similarity index 100% rename from images/ci-openshift-golang-builder-previous.rhel9 rename to images/ci-openshift-golang-builder-previous.rhel9.yml diff --git a/images/openshift-base-rhel9.yml b/images/openshift-base-rhel9.yml index 0bd9f71962..099b67471c 100644 --- a/images/openshift-base-rhel9.yml +++ b/images/openshift-base-rhel9.yml @@ -9,19 +9,7 @@ content: 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-9-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-9/base-repos - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-base-openshift-{MAJOR}.{MINOR} + mirror: false okd_alignment: resolve_as: stream: centos_stream9