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

Automate config brancher by auto-config-brancher job at Fri, 26 Apr 2024 12:05:52 UTC

ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-main.yaml

@@ -7,10 +7,10 @@ base_images:
     name: 4.16-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.20-openshift-4.16
+    tag: rhel-9-golang-1.21-openshift-4.16
 binary_build_commands: make operator
 build_root:
   image_stream_tag:
@@ -24,9 +24,9 @@ images:
     ocp_4.16_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.16:base-rhel9
-    ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: cluster-kube-cluster-api-operator
 promotion:
   to:

ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.16.yaml

@@ -7,10 +7,10 @@ base_images:
     name: 4.16-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.20-openshift-4.16
+    tag: rhel-9-golang-1.21-openshift-4.16
 binary_build_commands: make operator
 build_root:
   image_stream_tag:
@@ -24,9 +24,9 @@ images:
     ocp_4.16_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.16:base-rhel9
-    ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: cluster-kube-cluster-api-operator
 promotion:
   to:

ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.17.yaml

@@ -7,10 +7,10 @@ base_images:
     name: 4.17-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.20-openshift-4.16
+    tag: rhel-9-golang-1.21-openshift-4.16
 binary_build_commands: make operator
 build_root:
   image_stream_tag:
@@ -24,9 +24,9 @@ images:
     ocp_4.16_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.16:base-rhel9
-    ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: cluster-kube-cluster-api-operator
 promotion:
   to:

ci-operator/config/openshift-priv/installer/openshift-priv-installer-master__altinfra.yaml

@@ -3,14 +3,22 @@ base_images:
     name: 4.16-priv
     namespace: ocp-private
     tag: cli
-  ocp_4.16_base:
+  ocp_4.16_base-rhel9:
     name: 4.16-priv
     namespace: ocp-private
-    tag: base
-  ocp_builder_rhel-8-golang-1.21-openshift-4.16:
+    tag: base-rhel9
+  ocp_4.16_etcd:
+    name: 4.16-priv
+    namespace: ocp-private
+    tag: etcd
+  ocp_4.16_hyperkube:
+    name: 4.16-priv
+    namespace: ocp-private
+    tag: hyperkube
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.21-openshift-4.16
+    tag: rhel-9-golang-1.21-openshift-4.16
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/installer
@@ -20,12 +28,18 @@ images:
     value: "true"
   dockerfile_path: images/installer-altinfra/Dockerfile.ci
   inputs:
-    ocp_4.16_base:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_4.16_etcd:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:etcd
+    ocp_4.16_hyperkube:
       as:
-      - registry.ci.openshift.org/ocp/4.16:base
-    ocp_builder_rhel-8-golang-1.21-openshift-4.16:
+      - registry.ci.openshift.org/ocp/4.16:hyperkube
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: installer
 - dockerfile_literal: |
     FROM src

ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16__altinfra.yaml

@@ -3,14 +3,22 @@ base_images:
     name: 4.16-priv
     namespace: ocp-private
     tag: cli
-  ocp_4.16_base:
+  ocp_4.16_base-rhel9:
     name: 4.16-priv
     namespace: ocp-private
-    tag: base
-  ocp_builder_rhel-8-golang-1.21-openshift-4.16:
+    tag: base-rhel9
+  ocp_4.16_etcd:
+    name: 4.16-priv
+    namespace: ocp-private
+    tag: etcd
+  ocp_4.16_hyperkube:
+    name: 4.16-priv
+    namespace: ocp-private
+    tag: hyperkube
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.21-openshift-4.16
+    tag: rhel-9-golang-1.21-openshift-4.16
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/installer
@@ -20,12 +28,18 @@ images:
     value: "true"
   dockerfile_path: images/installer-altinfra/Dockerfile.ci
   inputs:
-    ocp_4.16_base:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_4.16_etcd:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:etcd
+    ocp_4.16_hyperkube:
       as:
-      - registry.ci.openshift.org/ocp/4.16:base
-    ocp_builder_rhel-8-golang-1.21-openshift-4.16:
+      - registry.ci.openshift.org/ocp/4.16:hyperkube
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: installer
 - dockerfile_literal: |
     FROM src

ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.17__altinfra.yaml

@@ -3,14 +3,22 @@ base_images:
     name: 4.17-priv
     namespace: ocp-private
     tag: cli
-  ocp_4.16_base:
+  ocp_4.16_base-rhel9:
     name: 4.17-priv
     namespace: ocp-private
-    tag: base
-  ocp_builder_rhel-8-golang-1.21-openshift-4.16:
+    tag: base-rhel9
+  ocp_4.16_etcd:
+    name: 4.17-priv
+    namespace: ocp-private
+    tag: etcd
+  ocp_4.16_hyperkube:
+    name: 4.17-priv
+    namespace: ocp-private
+    tag: hyperkube
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
     name: builder
     namespace: ocp
-    tag: rhel-8-golang-1.21-openshift-4.16
+    tag: rhel-9-golang-1.21-openshift-4.16
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/installer
@@ -20,12 +28,18 @@ images:
     value: "true"
   dockerfile_path: images/installer-altinfra/Dockerfile.ci
   inputs:
-    ocp_4.16_base:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_4.16_etcd:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:etcd
+    ocp_4.16_hyperkube:
       as:
-      - registry.ci.openshift.org/ocp/4.16:base
-    ocp_builder_rhel-8-golang-1.21-openshift-4.16:
+      - registry.ci.openshift.org/ocp/4.16:hyperkube
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: installer
 - dockerfile_literal: |
     FROM src

ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml

@@ -144,20 +144,20 @@ tests:
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-tests
 - as: ocp-conformance-rhel-eus
-  run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|origin/.*|vendor/.*|Makefile.*|scripts/.*)$
+  run_if_changed: ^(assets/.*|etcd/.*|vendor/.*)$
   steps:
     cluster_profile: aws
     env:
       MICROSHIFT_OS: rhel-9.4
-    workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
+    workflow: openshift-microshift-e2e-origin-conformance
 - as: ocp-conformance-rhel-eus-arm
-  run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|origin/.*|vendor/.*|Makefile.*|scripts/.*)$
+  run_if_changed: ^(assets/.*|etcd/.*|vendor/.*)$
   steps:
     cluster_profile: aws
     env:
       EC2_INSTANCE_TYPE: t4g.2xlarge
       MICROSHIFT_OS: rhel-9.4
-    workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
+    workflow: openshift-microshift-e2e-origin-conformance
 zz_generated_metadata:
   branch: main
   org: openshift-priv

ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.16.yaml

@@ -145,20 +145,20 @@ tests:
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-tests
 - as: ocp-conformance-rhel-eus
-  run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|origin/.*|vendor/.*|Makefile.*|scripts/.*)$
+  run_if_changed: ^(assets/.*|etcd/.*|vendor/.*)$
   steps:
     cluster_profile: aws
     env:
       MICROSHIFT_OS: rhel-9.4
-    workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
+    workflow: openshift-microshift-e2e-origin-conformance
 - as: ocp-conformance-rhel-eus-arm
-  run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|origin/.*|vendor/.*|Makefile.*|scripts/.*)$
+  run_if_changed: ^(assets/.*|etcd/.*|vendor/.*)$
   steps:
     cluster_profile: aws
     env:
       EC2_INSTANCE_TYPE: t4g.2xlarge
       MICROSHIFT_OS: rhel-9.4
-    workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
+    workflow: openshift-microshift-e2e-origin-conformance
 zz_generated_metadata:
   branch: release-4.16
   org: openshift-priv

ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.17.yaml

@@ -144,20 +144,20 @@ tests:
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-tests
 - as: ocp-conformance-rhel-eus
-  run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|origin/.*|vendor/.*|Makefile.*|scripts/.*)$
+  run_if_changed: ^(assets/.*|etcd/.*|vendor/.*)$
   steps:
     cluster_profile: aws
     env:
       MICROSHIFT_OS: rhel-9.4
-    workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
+    workflow: openshift-microshift-e2e-origin-conformance
 - as: ocp-conformance-rhel-eus-arm
-  run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|origin/.*|vendor/.*|Makefile.*|scripts/.*)$
+  run_if_changed: ^(assets/.*|etcd/.*|vendor/.*)$
   steps:
     cluster_profile: aws
     env:
       EC2_INSTANCE_TYPE: t4g.2xlarge
       MICROSHIFT_OS: rhel-9.4
-    workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
+    workflow: openshift-microshift-e2e-origin-conformance
 zz_generated_metadata:
   branch: release-4.17
   org: openshift-priv

ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-main.yaml

@@ -7,10 +7,10 @@ base_images:
     name: "4.16"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.20-openshift-4.16
+    tag: rhel-9-golang-1.21-openshift-4.16
 binary_build_commands: make operator
 build_root:
   image_stream_tag:
@@ -24,9 +24,9 @@ images:
     ocp_4.16_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.16:base-rhel9
-    ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: cluster-kube-cluster-api-operator
 promotion:
   to:

ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-main__okd-scos.yaml

@@ -19,7 +19,7 @@ images:
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: cluster-kube-cluster-api-operator
 promotion:
   to:

ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.16.yaml

@@ -7,10 +7,10 @@ base_images:
     name: "4.16"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.20-openshift-4.16
+    tag: rhel-9-golang-1.21-openshift-4.16
 binary_build_commands: make operator
 build_root:
   image_stream_tag:
@@ -24,9 +24,9 @@ images:
     ocp_4.16_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.16:base-rhel9
-    ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: cluster-kube-cluster-api-operator
 promotion:
   to:

ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.17.yaml

@@ -7,10 +7,10 @@ base_images:
     name: "4.17"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.20-openshift-4.16
+    tag: rhel-9-golang-1.21-openshift-4.16
 binary_build_commands: make operator
 build_root:
   image_stream_tag:
@@ -24,9 +24,9 @@ images:
     ocp_4.16_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.16:base-rhel9
-    ocp_builder_rhel-9-golang-1.20-openshift-4.16:
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: cluster-kube-cluster-api-operator
 promotion:
   to: