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

Automate config brancher by auto-config-brancher job at Mon, 16 Dec 2024 00:05:56 UTC
openshift · Dec 16, 2024 · 706475b · 706475b
2 parents 81db806 + 5c9ce61
commit 706475b
Show file tree

Hide file tree

Showing 14 changed files with 119 additions and 120 deletions.
diff --git a/.../config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-main.yaml b/.../config/openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-main.yaml
@@ -1,25 +1,25 @@
 base_images:
-  ocp_4.18_base-rhel9:
+  ocp_4.19_base-rhel9:
     name: 4.19-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-olm-operator
 images:
 - dockerfile_path: Dockerfile
   inputs:
-    ocp_4.18_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.18:base-rhel9
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-olm-operator
 promotion:
   to:

diff --git a/...openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.19.yaml b/...openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.19.yaml
@@ -1,25 +1,25 @@
 base_images:
-  ocp_4.18_base-rhel9:
+  ocp_4.19_base-rhel9:
     name: 4.19-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-olm-operator
 images:
 - dockerfile_path: Dockerfile
   inputs:
-    ocp_4.18_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.18:base-rhel9
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-olm-operator
 promotion:
   to:

diff --git a/...openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.20.yaml b/...openshift-priv/cluster-olm-operator/openshift-priv-cluster-olm-operator-release-4.20.yaml
@@ -1,25 +1,25 @@
 base_images:
-  ocp_4.18_base-rhel9:
+  ocp_4.19_base-rhel9:
     name: 4.20-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-olm-operator
 images:
 - dockerfile_path: Dockerfile
   inputs:
-    ocp_4.18_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.18:base-rhel9
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-olm-operator
 promotion:
   to:

diff --git a/...priv-cluster-version-operator-master.yaml → ...t-priv-cluster-version-operator-main.yaml b/...priv-cluster-version-operator-master.yaml → ...t-priv-cluster-version-operator-main.yaml
@@ -152,6 +152,6 @@ tests:
       FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-upgrade-azure
 zz_generated_metadata:
-  branch: master
+  branch: main
   org: openshift-priv
   repo: cluster-version-operator
diff --git a/...v-multus-admission-controller-master.yaml → ...riv-multus-admission-controller-main.yaml b/...v-multus-admission-controller-master.yaml → ...riv-multus-admission-controller-main.yaml
@@ -52,6 +52,6 @@ tests:
       PROJECT_NAME: multus-admission-controller
     workflow: openshift-ci-security
 zz_generated_metadata:
-  branch: master
+  branch: main
   org: openshift-priv
   repo: multus-admission-controller
diff --git a/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main.yaml b/ci-operator/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main.yaml
@@ -1,24 +1,24 @@
 base_images:
-  ocp_4.18_base-rhel9:
+  ocp_4.19_base-rhel9:
     name: "4.19"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
   inputs:
-    ocp_4.18_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.18:base-rhel9
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-olm-operator
 promotion:
   to:

diff --git a/.../config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main__okd-scos.yaml b/.../config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-main__okd-scos.yaml
@@ -22,7 +22,7 @@ images:
     ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
       - builder
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-olm-operator
 promotion:
   to:

diff --git a/...or/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.19.yaml b/...or/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.19.yaml
@@ -1,24 +1,24 @@
 base_images:
-  ocp_4.18_base-rhel9:
+  ocp_4.19_base-rhel9:
     name: "4.19"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
   inputs:
-    ocp_4.18_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.18:base-rhel9
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-olm-operator
 promotion:
   to:

diff --git a/...or/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.20.yaml b/...or/config/openshift/cluster-olm-operator/openshift-cluster-olm-operator-release-4.20.yaml
@@ -1,24 +1,24 @@
 base_images:
-  ocp_4.18_base-rhel9:
+  ocp_4.19_base-rhel9:
     name: "4.20"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build
 build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
   inputs:
-    ocp_4.18_base-rhel9:
+    ocp_4.19_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.18:base-rhel9
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+      - registry.ci.openshift.org/ocp/4.19:base-rhel9
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-olm-operator
 promotion:
   to:

diff --git a/...-version-operator-master-postsubmits.yaml → ...er-version-operator-main-postsubmits.yaml b/...-version-operator-master-postsubmits.yaml → ...er-version-operator-main-postsubmits.yaml
@@ -3,8 +3,8 @@ postsubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    cluster: build10
+    - ^main$
+    cluster: build03
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -15,7 +15,7 @@ postsubmits:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-priv-cluster-version-operator-master-images
+    name: branch-ci-openshift-priv-cluster-version-operator-main-images
     path_alias: github.com/openshift/cluster-version-operator
     spec:
       containers: