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

Automate config brancher by auto-config-brancher job at Tue, 19 Nov 2024 04:04:32 UTC

Author: openshift-merge-bot[bot]

ci-operator/config/openshift-priv/operator-framework-operator-controller/openshift-priv-operator-framework-operator-controller-main.yaml

@@ -24,9 +24,20 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
   to: olm-operator-controller
+- dockerfile_path: openshift/registry.Dockerfile
+  inputs:
+    ocp_4.18_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.18:base-rhel9
+    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+  to: e2e-test-registry
 promotion:
   to:
-  - name: 4.18-priv
+  - excluded_images:
+    - e2e-test-registry
+    name: 4.18-priv
     namespace: ocp-private
 releases:
   initial:

ci-operator/config/openshift-priv/operator-framework-operator-controller/openshift-priv-operator-framework-operator-controller-release-4.18.yaml

@@ -24,9 +24,20 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
   to: olm-operator-controller
+- dockerfile_path: openshift/registry.Dockerfile
+  inputs:
+    ocp_4.18_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.18:base-rhel9
+    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+  to: e2e-test-registry
 promotion:
   to:
   - disabled: true
+    excluded_images:
+    - e2e-test-registry
     name: 4.18-priv
     namespace: ocp-private
 releases:

ci-operator/config/openshift-priv/operator-framework-operator-controller/openshift-priv-operator-framework-operator-controller-release-4.19.yaml

@@ -24,9 +24,20 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
   to: olm-operator-controller
+- dockerfile_path: openshift/registry.Dockerfile
+  inputs:
+    ocp_4.18_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.18:base-rhel9
+    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+  to: e2e-test-registry
 promotion:
   to:
-  - name: 4.19-priv
+  - excluded_images:
+    - e2e-test-registry
+    name: 4.19-priv
     namespace: ocp-private
 releases:
   initial:

ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.18.yaml

@@ -23,9 +23,20 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
   to: olm-operator-controller
+- dockerfile_path: openshift/registry.Dockerfile
+  inputs:
+    ocp_4.18_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.18:base-rhel9
+    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+  to: e2e-test-registry
 promotion:
   to:
   - disabled: true
+    excluded_images:
+    - e2e-test-registry
     name: "4.18"
     namespace: ocp
 releases:

ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.19.yaml

@@ -23,9 +23,20 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
   to: olm-operator-controller
+- dockerfile_path: openshift/registry.Dockerfile
+  inputs:
+    ocp_4.18_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.18:base-rhel9
+    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+  to: e2e-test-registry
 promotion:
   to:
-  - name: "4.19"
+  - excluded_images:
+    - e2e-test-registry
+    name: "4.19"
     namespace: ocp
 releases:
   initial:

clusters/hosted-mgmt/hive/pools/ocp-release-4.17.5-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.5-x86-64-for-4.17.0-0-to-4.18.0-0