base_images: swap openshift_release_* for ocp_builder_* images

ci-operator/config/openshift-pipelines/task-buildpacks/openshift-pipelines-task-buildpacks-main.yaml

@@ -1,8 +1,8 @@
 base_images:
-  openshift_release_golang-1.21:
-    name: release
-    namespace: openshift
-    tag: golang-1.21
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.21-openshift-4.16
 build_root:
   image_stream_tag:
     name: builder
@@ -11,9 +11,9 @@ build_root:
 images:
 - dockerfile_path: ci/ci.Dockerfile
   inputs:
-    openshift_release_golang-1.21:
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: base-tests
 releases:
   initial:

ci-operator/config/openshift-pipelines/task-containers/openshift-pipelines-task-containers-main.yaml

@@ -1,8 +1,8 @@
 base_images:
-  openshift_release_golang-1.21:
-    name: release
-    namespace: openshift
-    tag: golang-1.21
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.21-openshift-4.16
 build_root:
   image_stream_tag:
     name: builder
@@ -11,9 +11,9 @@ build_root:
 images:
 - dockerfile_path: ci/ci.Dockerfile
   inputs:
-    openshift_release_golang-1.21:
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: base-tests
 releases:
   initial:

ci-operator/config/openshift-pipelines/task-git/openshift-pipelines-task-git-main.yaml

@@ -1,8 +1,8 @@
 base_images:
-  openshift_release_golang-1.21:
-    name: release
-    namespace: openshift
-    tag: golang-1.21
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.21-openshift-4.16
 build_root:
   image_stream_tag:
     name: builder
@@ -11,9 +11,9 @@ build_root:
 images:
 - dockerfile_path: ci/ci.Dockerfile
   inputs:
-    openshift_release_golang-1.21:
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: base-tests
 releases:
   initial:

ci-operator/config/openshift-pipelines/task-maven/openshift-pipelines-task-maven-main.yaml

@@ -1,8 +1,8 @@
 base_images:
-  openshift_release_golang-1.21:
-    name: release
-    namespace: openshift
-    tag: golang-1.21
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.21-openshift-4.16
 build_root:
   image_stream_tag:
     name: builder
@@ -11,9 +11,9 @@ build_root:
 images:
 - dockerfile_path: ci/ci.Dockerfile
   inputs:
-    openshift_release_golang-1.21:
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: base-tests
 releases:
   initial:

ci-operator/config/openshift-pipelines/task-openshift/openshift-pipelines-task-openshift-main.yaml

@@ -1,8 +1,8 @@
 base_images:
-  openshift_release_golang-1.21:
-    name: release
-    namespace: openshift
-    tag: golang-1.21
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.21-openshift-4.16
 build_root:
   image_stream_tag:
     name: builder
@@ -11,9 +11,9 @@ build_root:
 images:
 - dockerfile_path: ci/ci.Dockerfile
   inputs:
-    openshift_release_golang-1.21:
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: base-tests
 releases:
   initial:

ci-operator/config/openshift-priv/cluster-api-actuator-pkg/openshift-priv-cluster-api-actuator-pkg-release-4.18.yaml

@@ -1,17 +1,17 @@
 base_images:
-  openshift_release_golang-1.22:
-    name: release
-    namespace: openshift
-    tag: golang-1.22
+  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.22-openshift-4.18
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-api-actuator-pkg
 images:
 - dockerfile_path: Dockerfile.ci
   inputs:
-    openshift_release_golang-1.22:
+    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.22
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
   to: cluster-api-actuator-pkg-test
 promotion:
   to:

ci-operator/config/openshift-priv/cluster-api-provider-kubevirt/openshift-priv-cluster-api-provider-kubevirt-main.yaml

@@ -15,24 +15,24 @@ base_images:
     name: hypershift-tests
     namespace: hypershift
     tag: latest
-  openshift_release_golang-1.24:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.24-openshift-4.21
+  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.24-openshift-4.21
 binary_build_commands: make manager
 build_root:
   image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.24-openshift-4.21
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.24-openshift-4.21
 canonical_go_repository: github.com/openshift/cluster-api-provider-kubevirt
 images:
 - build_args:
   - name: ARCH
     value: amd64
   - name: ldflags
   dockerfile_literal: |-
-    FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.21 as toolchain
+    FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 as toolchain
 
     # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
     ARG goproxy=https://proxy.golang.org
@@ -62,9 +62,9 @@ images:
     ENTRYPOINT ["/manager"]
   from: base
   inputs:
-    openshift_release_golang-1.24:
+    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
   to: cluster-api-provider-kubevirt
 promotion:
   to:

ci-operator/config/openshift-priv/cluster-api-provider-kubevirt/openshift-priv-cluster-api-provider-kubevirt-release-4.14.yaml

@@ -15,24 +15,24 @@ base_images:
     name: hypershift-tests
     namespace: hypershift
     tag: latest
-  openshift_release_golang-1.20:
-    name: release
-    namespace: openshift
-    tag: golang-1.20
+  ocp_builder_rhel-9-golang-1.20-openshift-4.14:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.20-openshift-4.14
 binary_build_commands: make manager
 build_root:
   image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.20
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.20-openshift-4.14
 canonical_go_repository: github.com/openshift/cluster-api-provider-kubevirt
 images:
 - build_args:
   - name: ARCH
     value: amd64
   - name: ldflags
   dockerfile_literal: |-
-    FROM registry.ci.openshift.org/openshift/release:golang-1.20 as toolchain
+    FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14 as toolchain
 
     # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
     ARG goproxy=https://proxy.golang.org
@@ -62,9 +62,9 @@ images:
     ENTRYPOINT ["/manager"]
   from: base
   inputs:
-    openshift_release_golang-1.20:
+    ocp_builder_rhel-9-golang-1.20-openshift-4.14:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.20
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.14
   to: cluster-api-provider-kubevirt
 promotion:
   to:

ci-operator/config/openshift-priv/cluster-api-provider-kubevirt/openshift-priv-cluster-api-provider-kubevirt-release-4.15.yaml

@@ -15,24 +15,24 @@ base_images:
     name: hypershift-tests
     namespace: hypershift
     tag: latest
-  openshift_release_golang-1.20:
-    name: release
-    namespace: openshift
-    tag: golang-1.20
+  ocp_builder_rhel-9-golang-1.20-openshift-4.15:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.20-openshift-4.15
 binary_build_commands: make manager
 build_root:
   image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.20
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.20-openshift-4.15
 canonical_go_repository: github.com/openshift/cluster-api-provider-kubevirt
 images:
 - build_args:
   - name: ARCH
     value: amd64
   - name: ldflags
   dockerfile_literal: |-
-    FROM registry.ci.openshift.org/openshift/release:golang-1.20 as toolchain
+    FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 as toolchain
 
     # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
     ARG goproxy=https://proxy.golang.org
@@ -62,9 +62,9 @@ images:
     ENTRYPOINT ["/manager"]
   from: base
   inputs:
-    openshift_release_golang-1.20:
+    ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.20
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: cluster-api-provider-kubevirt
 promotion:
   to:

ci-operator/config/openshift-priv/cluster-api-provider-kubevirt/openshift-priv-cluster-api-provider-kubevirt-release-4.16.yaml

@@ -15,24 +15,24 @@ base_images:
     name: hypershift-tests
     namespace: hypershift
     tag: latest
-  openshift_release_golang-1.20:
-    name: release
-    namespace: openshift
-    tag: golang-1.20
+  ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.20-openshift-4.16
 binary_build_commands: make manager
 build_root:
   image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: golang-1.20
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.20-openshift-4.16
 canonical_go_repository: github.com/openshift/cluster-api-provider-kubevirt
 images:
 - build_args:
   - name: ARCH
     value: amd64
   - name: ldflags
   dockerfile_literal: |-
-    FROM registry.ci.openshift.org/openshift/release:golang-1.20 as toolchain
+    FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16 as toolchain
 
     # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
     ARG goproxy=https://proxy.golang.org
@@ -62,9 +62,9 @@ images:
     ENTRYPOINT ["/manager"]
   from: base
   inputs:
-    openshift_release_golang-1.20:
+    ocp_builder_rhel-9-golang-1.20-openshift-4.16:
       as:
-      - registry.ci.openshift.org/openshift/release:golang-1.20
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16
   to: cluster-api-provider-kubevirt
 promotion:
   to:

ci-operator/config/openshift-priv/cluster-api-provider-kubevirt/openshift-priv-cluster-api-provider-kubevirt-release-4.17.yaml

@@ -15,24 +15,24 @@ base_images:
     name: hypershift-tests
     namespace: hypershift
     tag: latest
-  openshift_release_golang-1.22:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.22-openshift-4.17
+  ocp_builder_rhel-9-golang-1.22-openshift-4.17:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.22-openshift-4.17
 binary_build_commands: make manager
 build_root:
   image_stream_tag:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.22-openshift-4.17
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.22-openshift-4.17
 canonical_go_repository: github.com/openshift/cluster-api-provider-kubevirt
 images:
 - build_args:
   - name: ARCH
     value: amd64
   - name: ldflags
   dockerfile_literal: |-
-    FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 as toolchain
+    FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 as toolchain
 
     # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
     ARG goproxy=https://proxy.golang.org
@@ -62,9 +62,9 @@ images:
     ENTRYPOINT ["/manager"]
   from: base
   inputs:
-    openshift_release_golang-1.22:
+    ocp_builder_rhel-9-golang-1.22-openshift-4.17:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
   to: cluster-api-provider-kubevirt
 promotion:
   to: