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

Automate config brancher by auto-config-brancher job at Mon, 28 Oct 2024 16:14:33 UTC
openshift · Oct 28, 2024 · b9b1398 · b9b1398
2 parents 1c8fe70 + 9952a45
commit b9b1398
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/...or/config/openshift-kni/cnf-features-deploy/openshift-kni-cnf-features-deploy-master.yaml b/...or/config/openshift-kni/cnf-features-deploy/openshift-kni-cnf-features-deploy-master.yaml
@@ -7,10 +7,6 @@ base_images:
     name: "4.18"
     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
   ocp_builder_rhel-8-golang-1.22-openshift-4.18:
     name: builder
     namespace: ocp
@@ -40,9 +36,9 @@ images:
   dockerfile_path: ztp/resource-generator/Containerfile
   from: os-min8
   inputs:
-    ocp_builder_rhel-8-golang-1.21-openshift-4.16:
+    ocp_builder_rhel-8-golang-1.22-openshift-4.18:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.18
   to: ztp-site-generator
 promotion:
   to:

diff --git a/...fig/openshift-kni/cnf-features-deploy/openshift-kni-cnf-features-deploy-release-4.17.yaml b/...fig/openshift-kni/cnf-features-deploy/openshift-kni-cnf-features-deploy-release-4.17.yaml
@@ -7,10 +7,6 @@ base_images:
     name: "4.17"
     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
   ocp_builder_rhel-8-golang-1.22-openshift-4.17:
     name: builder
     namespace: ocp
@@ -40,9 +36,9 @@ images:
   dockerfile_path: ztp/resource-generator/Containerfile
   from: os-min8
   inputs:
-    ocp_builder_rhel-8-golang-1.21-openshift-4.16:
+    ocp_builder_rhel-8-golang-1.22-openshift-4.17:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
   to: ztp-site-generator
 promotion:
   to:

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

diff --git a/...d-mgmt/hive/pools/ocp-release-4.17.3-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml b/...d-mgmt/hive/pools/ocp-release-4.17.3-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml
@@ -3,7 +3,6 @@ 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.3-x86-64-for-4.17.0-0-to-4.18.0-0