Merge pull request openshift#55155 from openshift-bot/auto-config-bra…

…ncher Automate config brancher by auto-config-brancher job at Fri, 02 Aug 2024 20:04:58 UTC
aleskandro · Aug 2, 2024 · b0947bd · b0947bd
2 parents 3372544 + 5534fa0
commit b0947bd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/ci-operator/config/openshift/hive/openshift-hive-mce-2.6.yaml b/ci-operator/config/openshift/hive/openshift-hive-mce-2.6.yaml
@@ -3,14 +3,6 @@ base_images:
     name: "4.16"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-8-golang-1.21-openshift-4.16:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.21-openshift-4.16
-  openshift_release_rhel-9-release-golang-1.21-openshift-4.16:
-    name: release
-    namespace: openshift
-    tag: rhel-9-release-golang-1.21-openshift-4.16
 binary_build_commands: GO_COMPLIANCE_INFO=0 make build
 build_root:
   image_stream_tag:
@@ -20,13 +12,6 @@ build_root:
 images:
 - dockerfile_path: Dockerfile
   from: ocp_4.16_base-rhel9
-  inputs:
-    ocp_builder_rhel-8-golang-1.21-openshift-4.16:
-      as:
-      - registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16
-    openshift_release_rhel-9-release-golang-1.21-openshift-4.16:
-      as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.21-openshift-4.16
   to: hive
 promotion:
   to:

diff --git a/...-mgmt/hive/pools/ocp-release-4.15.25-x86-64-for-4.15.0-0-to-4.16.0-0_clusterimageset.yaml b/...-mgmt/hive/pools/ocp-release-4.15.25-x86-64-for-4.15.0-0-to-4.16.0-0_clusterimageset.yaml
@@ -3,6 +3,7 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.15.0-0
+    version_stream: 4-stable
     version_upper: 4.16.0-0
   creationTimestamp: null
   name: ocp-release-4.15.25-x86-64-for-4.15.0-0-to-4.16.0-0

diff --git a/...d-mgmt/hive/pools/ocp-release-4.16.6-x86-64-for-4.16.0-0-to-4.17.0-0_clusterimageset.yaml b/...d-mgmt/hive/pools/ocp-release-4.16.6-x86-64-for-4.16.0-0-to-4.17.0-0_clusterimageset.yaml
@@ -3,6 +3,7 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.16.0-0
+    version_stream: 4-stable
     version_upper: 4.17.0-0
   creationTimestamp: null
   name: ocp-release-4.16.6-x86-64-for-4.16.0-0-to-4.17.0-0