Merge pull request #61213 from openshift-bot/auto-config-brancher

Automate config brancher by auto-config-brancher job at Mon, 03 Feb 2025 16:06:01 UTC
openshift · Feb 3, 2025 · 6e579e8 · 6e579e8
2 parents 8dad8dc + 71a3c6d
commit 6e579e8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/ci-operator/config/backube/volsync/backube-volsync-main.yaml b/ci-operator/config/backube/volsync/backube-volsync-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: "4.16"
     namespace: ocp
     tag: cli
-  ocp_builder_volsync:
-    name: builder
-    namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.17
   operator-sdk:
     name: "4.16"
     namespace: origin
@@ -53,10 +49,6 @@ images:
   to: src-oc
 - context_dir: .
   from: ubi_minimal
-  inputs:
-    ocp_builder_volsync:
-      as:
-      - golang:1.22
   to: volsync
 operator:
   bundles:

diff --git a/...-mgmt/hive/pools/ocp-release-4.16.33-x86-64-for-4.16.0-0-to-4.17.0-0_clusterimageset.yaml b/...-mgmt/hive/pools/ocp-release-4.16.33-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.33-x86-64-for-4.16.0-0-to-4.17.0-0

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