openshift · openshift-merge-bot · Aug 8, 2024 · Jul 26, 2024
diff --git a/ci-operator/config/openshift/oadp-operator/.config.prowgen b/ci-operator/config/openshift/oadp-operator/.config.prowgen
@@ -0,0 +1 @@
+multi_arch: yes
diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: ubi9-v1.22.2
 images:
 - dockerfile_path: Dockerfile
+  multi_arch: true
   to: oadp-operator
 promotion:
   to:

diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
 - dockerfile_path: Dockerfile
+  multi_arch: true
   to: oadp-operator-1.0
 promotion:
   to:

diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: rhel-8-golang-1.20-openshift-4.14
 images:
 - dockerfile_path: Dockerfile
+  multi_arch: true
   to: oadp-operator-1.3
 promotion:
   to:

diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: ubi9-v1.22.2
 images:
 - dockerfile_path: Dockerfile
+  multi_arch: true
   to: oadp-operator-1.4
 promotion:
   to:

diff --git a/ci-operator/config/openshift/openshift-velero-plugin/.config.prowgen b/ci-operator/config/openshift/openshift-velero-plugin/.config.prowgen
@@ -0,0 +1 @@
+multi_arch: yes
diff --git a/...or/config/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master.yaml b/...or/config/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: ubi9-v1.22.2
 images:
 - dockerfile_path: Dockerfile
+  multi_arch: true
   to: openshift-velero-plugin
 promotion:
   to:

diff --git a/.../config/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0.yaml b/.../config/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: golang-1.19
 images:
 - dockerfile_path: Dockerfile
+  multi_arch: true
   to: openshift-velero-plugin-oadp-1.0
 promotion:
   to:

diff --git a/.../config/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.3.yaml b/.../config/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.3.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: golang-1.20
 images:
 - dockerfile_path: Dockerfile
+  multi_arch: true
   to: openshift-velero-plugin-oadp-1.3
 promotion:
   to:

diff --git a/.../config/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.4.yaml b/.../config/openshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.4.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: ubi9-v1.22.2
 images:
 - dockerfile_path: Dockerfile
+  multi_arch: true
   to: openshift-velero-plugin-oadp-1.4
 promotion:
   to:

diff --git a/ci-operator/config/openshift/velero-plugin-for-aws/.config.prowgen b/ci-operator/config/openshift/velero-plugin-for-aws/.config.prowgen
@@ -0,0 +1 @@
+multi_arch: yes
diff --git a/.../config/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-konveyor-dev.yaml b/.../config/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-konveyor-dev.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: ubi9-v1.22.2
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-plugin-for-aws
 promotion:
   to:

diff --git a/...ator/config/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.0.yaml b/...ator/config/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.0.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: golang-1.19
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-plugin-for-aws-oadp-1.0
 promotion:
   to:

diff --git a/...ator/config/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.3.yaml b/...ator/config/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.3.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: golang-1.20
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-plugin-for-aws-oadp-1.3
 promotion:
   to:

diff --git a/...ator/config/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.4.yaml b/...ator/config/openshift/velero-plugin-for-aws/openshift-velero-plugin-for-aws-oadp-1.4.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: ubi9-v1.22.2
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-plugin-for-aws-oadp-1.4
 promotion:
   to:

diff --git a/ci-operator/config/openshift/velero-plugin-for-gcp/.config.prowgen b/ci-operator/config/openshift/velero-plugin-for-gcp/.config.prowgen
@@ -0,0 +1 @@
+multi_arch: yes
diff --git a/.../config/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-konveyor-dev.yaml b/.../config/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-konveyor-dev.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: ubi9-v1.22.2
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-plugin-for-gcp
 promotion:
   to:

diff --git a/...ator/config/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.0.yaml b/...ator/config/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.0.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: golang-1.19
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-plugin-for-gcp-oadp-1.0
 promotion:
   to:

diff --git a/...ator/config/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.3.yaml b/...ator/config/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.3.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: golang-1.20
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-plugin-for-gcp-oadp-1.3
 promotion:
   to:

diff --git a/...ator/config/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.4.yaml b/...ator/config/openshift/velero-plugin-for-gcp/openshift-velero-plugin-for-gcp-oadp-1.4.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: ubi9-v1.22.2
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-plugin-for-gcp-oadp-1.4
 promotion:
   to:

diff --git a/ci-operator/config/openshift/velero-plugin-for-microsoft-azure/.config.prowgen b/ci-operator/config/openshift/velero-plugin-for-microsoft-azure/.config.prowgen
@@ -0,0 +1 @@
+multi_arch: yes
diff --git a/...-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-konveyor-dev.yaml b/...-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-konveyor-dev.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: ubi9-v1.22.2
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-plugin-for-microsoft-azure
 promotion:
   to:

diff --git a/...lero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.0.yaml b/...lero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.0.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: golang-1.19
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-plugin-for-microsoft-azure-oadp-1.0
 promotion:
   to:

diff --git a/...lero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.3.yaml b/...lero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.3.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: golang-1.20
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-plugin-for-microsoft-azure-oadp-1.3
 promotion:
   to:

diff --git a/...lero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.4.yaml b/...lero-plugin-for-microsoft-azure/openshift-velero-plugin-for-microsoft-azure-oadp-1.4.yaml
@@ -5,6 +5,7 @@ build_root:
     tag: ubi9-v1.22.2
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-plugin-for-microsoft-azure-oadp-1.4
 promotion:
   to:

diff --git a/ci-operator/config/openshift/velero/.config.prowgen b/ci-operator/config/openshift/velero/.config.prowgen
@@ -0,0 +1 @@
+multi_arch: yes
diff --git a/ci-operator/config/openshift/velero/openshift-velero-konveyor-dev.yaml b/ci-operator/config/openshift/velero/openshift-velero-konveyor-dev.yaml
@@ -5,8 +5,10 @@ build_root:
     tag: ubi9-v1.22.2
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero
 - dockerfile_path: Dockerfile-velero-restore-helper.ubi
+  multi_arch: true
   to: velero-restore-helper
 promotion:
   to:

diff --git a/ci-operator/config/openshift/velero/openshift-velero-oadp-1.0.yaml b/ci-operator/config/openshift/velero/openshift-velero-oadp-1.0.yaml
@@ -5,8 +5,10 @@ build_root:
     tag: golang-1.19
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-oadp-1.0
 - dockerfile_path: Dockerfile-velero-restic-restore-helper.ubi
+  multi_arch: true
   to: velero-restic-restore-helper-oadp-1.0
 promotion:
   to:

diff --git a/ci-operator/config/openshift/velero/openshift-velero-oadp-1.3.yaml b/ci-operator/config/openshift/velero/openshift-velero-oadp-1.3.yaml
@@ -5,8 +5,10 @@ build_root:
     tag: rhel-8-golang-1.20-openshift-4.14
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-oadp-1.3
 - dockerfile_path: Dockerfile-velero-restore-helper.ubi
+  multi_arch: true
   to: velero-restore-helper-oadp-1.3
 promotion:
   to:

diff --git a/ci-operator/config/openshift/velero/openshift-velero-oadp-1.4.yaml b/ci-operator/config/openshift/velero/openshift-velero-oadp-1.4.yaml
@@ -5,8 +5,10 @@ build_root:
     tag: ubi9-v1.22.2
 images:
 - dockerfile_path: Dockerfile.ubi
+  multi_arch: true
   to: velero-oadp-1.4
 - dockerfile_path: Dockerfile-velero-restore-helper.ubi
+  multi_arch: true
   to: velero-restore-helper-oadp-1.4
 promotion:
   to:

diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-postsubmits.yaml
@@ -4,11 +4,12 @@ postsubmits:
     always_run: true
     branches:
     - ^master$
-    cluster: build02
+    cluster: build10
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/cluster: build10
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1

diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-master-presubmits.yaml
@@ -849,12 +849,13 @@ presubmits:
     branches:
     - ^master$
     - ^master-
-    cluster: build03
+    cluster: build10
     context: ci/prow/images
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/cluster: build10
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-oadp-operator-master-images

diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml
@@ -4,11 +4,12 @@ postsubmits:
     always_run: true
     branches:
     - ^oadp-1\.0$
-    cluster: build02
+    cluster: build10
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/cluster: build10
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1

diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml
@@ -399,12 +399,13 @@ presubmits:
     branches:
     - ^oadp-1\.0$
     - ^oadp-1\.0-
-    cluster: build03
+    cluster: build10
     context: ci/prow/images
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/cluster: build10
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-oadp-operator-oadp-1.0-images

diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-postsubmits.yaml
@@ -4,11 +4,12 @@ postsubmits:
     always_run: true
     branches:
     - ^oadp-1\.3$
-    cluster: build02
+    cluster: build10
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/cluster: build10
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1

diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml
@@ -793,12 +793,13 @@ presubmits:
     branches:
     - ^oadp-1\.3$
     - ^oadp-1\.3-
-    cluster: build03
+    cluster: build10
     context: ci/prow/images
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/cluster: build10
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-oadp-operator-oadp-1.3-images

diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-postsubmits.yaml
@@ -4,11 +4,12 @@ postsubmits:
     always_run: true
     branches:
     - ^oadp-1\.4$
-    cluster: build02
+    cluster: build10
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/cluster: build10
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1

diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml
@@ -849,12 +849,13 @@ presubmits:
     branches:
     - ^oadp-1\.4$
     - ^oadp-1\.4-
-    cluster: build03
+    cluster: build10
     context: ci/prow/images
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/cluster: build10
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-oadp-operator-oadp-1.4-images

diff --git a/...enshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master-postsubmits.yaml b/...enshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master-postsubmits.yaml
@@ -4,11 +4,12 @@ postsubmits:
     always_run: true
     branches:
     - ^master$
-    cluster: build01
+    cluster: build10
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/cluster: build10
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1

diff --git a/...penshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master-presubmits.yaml b/...penshift/openshift-velero-plugin/openshift-openshift-velero-plugin-master-presubmits.yaml
@@ -5,12 +5,13 @@ presubmits:
     branches:
     - ^master$
     - ^master-
-    cluster: build01
+    cluster: build10
     context: ci/prow/images
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/cluster: build10
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-openshift-velero-plugin-master-images

diff --git a/...shift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0-postsubmits.yaml b/...shift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0-postsubmits.yaml
@@ -4,11 +4,12 @@ postsubmits:
     always_run: true
     branches:
     - ^oadp-1\.0$
-    cluster: build01
+    cluster: build10
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/cluster: build10
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1

diff --git a/...nshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0-presubmits.yaml b/...nshift/openshift-velero-plugin/openshift-openshift-velero-plugin-oadp-1.0-presubmits.yaml
@@ -5,12 +5,13 @@ presubmits:
     branches:
     - ^oadp-1\.0$
     - ^oadp-1\.0-
-    cluster: build01
+    cluster: build10
     context: ci/prow/images
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
+      ci-operator.openshift.io/cluster: build10
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-openshift-velero-plugin-oadp-1.0-images
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		multi_arch: yes
mateusoliveira43 marked this conversation as resolved. Show resolved Hide resolved