Point ci build root images to multi

openshift-eng · Nov 4, 2024 · 43f4f95 · 43f4f95
1 parent da688e1
commit 43f4f95
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 255 deletions.
diff --git a/ci_transforms/rhel-8/ci-build-root/Dockerfile b/ci_transforms/rhel-8/ci-build-root/Dockerfile
diff --git a/ci_transforms/rhel-8/ci-build-root/OWNERS b/ci_transforms/rhel-8/ci-build-root/OWNERS
diff --git a/ci_transforms/rhel-8/golang/Dockerfile b/ci_transforms/rhel-8/golang/Dockerfile
diff --git a/ci_transforms/rhel-9/ci-build-root/Dockerfile b/ci_transforms/rhel-9/ci-build-root/Dockerfile
diff --git a/ci_transforms/rhel-9/golang/Dockerfile b/ci_transforms/rhel-9/golang/Dockerfile
diff --git a/images/ci-openshift-build-root-latest.rhel8.yml b/images/ci-openshift-build-root-latest.rhel8.yml
@@ -13,7 +13,7 @@ content:
         enabled: false
       mirror: true
       mirror_manifest_list: true
-      upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_LATEST}-ci-build-root-multi-openshift-{MAJOR}.{MINOR}
+      upstream_image: registry.ci.openshift.org/openshift/release:rhel-8-release-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR}
 from:
   member: ci-openshift-golang-builder-latest.rhel8
 labels:

diff --git a/images/ci-openshift-build-root-latest.rhel9.yml b/images/ci-openshift-build-root-latest.rhel9.yml
@@ -13,7 +13,7 @@ content:
         enabled: false
       mirror: true
       mirror_manifest_list: true
-      upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_LATEST}-ci-build-root-multi-openshift-{MAJOR}.{MINOR}
+      upstream_image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR}
 from:
   member: ci-openshift-golang-builder-latest.rhel9
 labels:

diff --git a/images/ci-openshift-build-root-previous.rhel8.disabled b/images/ci-openshift-build-root-previous.rhel8.disabled
@@ -13,7 +13,7 @@ content:
         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}
+      upstream_image: registry.ci.openshift.org/openshift/release:rhel-8-release-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR}
 from:
   member: ci-openshift-golang-builder-previous.rhel8
 labels:

diff --git a/images/ci-openshift-build-root-previous.rhel9.disabled b/images/ci-openshift-build-root-previous.rhel9.disabled
@@ -13,7 +13,7 @@ content:
         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}
+      upstream_image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR}
 from:
   member: ci-openshift-golang-builder-previous.rhel9
 labels:

diff --git a/streams.yml b/streams.yml
@@ -73,42 +73,6 @@ partner-rhel-9-golang-1.22:
   upstream_image_mirror:
   - quay.io/openshift-release-dev/golang-builder--ibm-share:rhel-9-golang-1.22-openshift-{MAJOR}.{MINOR}
 
-# This image is not used by ART. It is an artifact required in upstream CI to build unit tests.
-# Our transform is designed to create a buildconfig atop a specific golang version, layering on
-# packages that upstream has traditionally had present in its build_roots.
-rhel-8-golang-1.21-ci-build-root:
-  image: not_applicable
-  upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-{MAJOR}.{MINOR}
-  transform: rhel-8/ci-build-root
-  upstream_image: registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-{MAJOR}.{MINOR}
-
-# This image is not used by ART. It is an artifact required in upstream CI to build unit tests.
-# Our transform is designed to create a buildconfig atop a specific golang version, layering on
-# packages that upstream has traditionally had present in its build_roots.
-rhel-8-golang-ci-build-root:
-  image: not_applicable
-  upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-{MAJOR}.{MINOR}
-  transform: rhel-8/ci-build-root
-  upstream_image: registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-{MAJOR}.{MINOR}
-
-# This image is not used by ART. It is an artifact required in upstream CI to build unit tests.
-# Our transform is designed to create a buildconfig atop a specific golang version, layering on
-# packages that upstream has traditionally had present in its build_roots.
-rhel-9-golang-ci-build-root:
-  image: not_applicable
-  upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-{MAJOR}.{MINOR}
-  transform: rhel-9/ci-build-root
-  upstream_image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-{MAJOR}.{MINOR}
-
-# This image is not used by ART. It is an artifact required in upstream CI to build unit tests.
-# Our transform is designed to create a buildconfig atop a specific golang version, layering on
-# packages that upstream has traditionally had present in its build_roots.
-rhel-9-golang-1.21-ci-build-root:
-  image: not_applicable
-  upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-{MAJOR}.{MINOR}
-  transform: rhel-9/ci-build-root
-  upstream_image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.21-openshift-{MAJOR}.{MINOR}
-
 rhel8:
   # the most recent release at present. since we yum update this, it does not need to float.
   # it is important that we not build from unreleased builds and publish them.