OCPBUGS-49303: run 'make jobs'

openshift · Jan 27, 2025 · eaec4b3 · eaec4b3
1 parent 6de8b8d
commit eaec4b3
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 89 deletions.
diff --git a/...priv-ironic-image-master-postsubmits.yaml → ...t-priv-ironic-image-main-postsubmits.yaml b/...priv-ironic-image-master-postsubmits.yaml → ...t-priv-ironic-image-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-ironic-image-master-images
+    name: branch-ci-openshift-priv-ironic-image-main-images
     path_alias: github.com/openshift/ironic-image
     spec:
       containers:
@@ -71,8 +71,8 @@ postsubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    cluster: build10
+    - ^main$
+    cluster: build03
     decorate: true
     decoration_config:
       oauth_token_secret:
@@ -84,7 +84,7 @@ postsubmits:
       ci-operator.openshift.io/variant: prevalidation
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-priv-ironic-image-master-prevalidation-images
+    name: branch-ci-openshift-priv-ironic-image-main-prevalidation-images
     path_alias: github.com/openshift/ironic-image
     spec:
       containers:

diff --git a/...-priv-ironic-image-master-presubmits.yaml → ...ft-priv-ironic-image-main-presubmits.yaml b/...-priv-ironic-image-master-presubmits.yaml → ...ft-priv-ironic-image-main-presubmits.yaml
@@ -3,9 +3,9 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build05
+    - ^main$
+    - ^main-
+    cluster: build03
     context: ci/prow/check-requirements
     decorate: true
     decoration_config:
@@ -16,7 +16,7 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-image-master-check-requirements
+    name: pull-ci-openshift-priv-ironic-image-main-check-requirements
     path_alias: github.com/openshift/ironic-image
     rerun_command: /test check-requirements
     spec:
@@ -66,8 +66,8 @@ presubmits:
   - agent: kubernetes
     always_run: false
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build05
     context: ci/prow/e2e-metal-ipi-bm
     decorate: true
@@ -83,7 +83,7 @@ presubmits:
       ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-image-master-e2e-metal-ipi-bm
+    name: pull-ci-openshift-priv-ironic-image-main-e2e-metal-ipi-bm
     path_alias: github.com/openshift/ironic-image
     rerun_command: /test e2e-metal-ipi-bm
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
@@ -151,8 +151,8 @@ presubmits:
   - agent: kubernetes
     always_run: false
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build05
     context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
@@ -168,7 +168,7 @@ presubmits:
       ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-image-master-e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-priv-ironic-image-main-e2e-metal-ipi-ovn-ipv6
     path_alias: github.com/openshift/ironic-image
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
@@ -236,8 +236,8 @@ presubmits:
   - agent: kubernetes
     always_run: false
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build05
     context: ci/prow/e2e-metal-ipi-virtualmedia
     decorate: true
@@ -253,7 +253,7 @@ presubmits:
       ci-operator.openshift.io/cluster: build05
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-image-master-e2e-metal-ipi-virtualmedia
+    name: pull-ci-openshift-priv-ironic-image-main-e2e-metal-ipi-virtualmedia
     path_alias: github.com/openshift/ironic-image
     rerun_command: /test e2e-metal-ipi-virtualmedia
     skip_if_only_changed: \.md$|^(DCO|LICENSE|OWNERS|.*packages-list.*)$
@@ -321,9 +321,9 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build05
+    - ^main$
+    - ^main-
+    cluster: build03
     context: ci/prow/images
     decorate: true
     decoration_config:
@@ -334,7 +334,7 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-image-master-images
+    name: pull-ci-openshift-priv-ironic-image-main-images
     path_alias: github.com/openshift/ironic-image
     rerun_command: /test images
     spec:
@@ -384,8 +384,8 @@ presubmits:
   - agent: kubernetes
     always_run: false
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build05
     context: ci/prow/prevalidation-e2e-metal-ipi-bm-prevalidation
     decorate: true
@@ -402,7 +402,7 @@ presubmits:
       ci-operator.openshift.io/variant: prevalidation
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-image-master-prevalidation-e2e-metal-ipi-bm-prevalidation
+    name: pull-ci-openshift-priv-ironic-image-main-prevalidation-e2e-metal-ipi-bm-prevalidation
     path_alias: github.com/openshift/ironic-image
     rerun_command: /test prevalidation-e2e-metal-ipi-bm-prevalidation
     run_if_changed: .*packages-list.*
@@ -471,8 +471,8 @@ presubmits:
   - agent: kubernetes
     always_run: false
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build05
     context: ci/prow/prevalidation-e2e-metal-ipi-ovn-ipv6-prevalidation
     decorate: true
@@ -489,7 +489,7 @@ presubmits:
       ci-operator.openshift.io/variant: prevalidation
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-image-master-prevalidation-e2e-metal-ipi-ovn-ipv6-prevalidation
+    name: pull-ci-openshift-priv-ironic-image-main-prevalidation-e2e-metal-ipi-ovn-ipv6-prevalidation
     path_alias: github.com/openshift/ironic-image
     rerun_command: /test prevalidation-e2e-metal-ipi-ovn-ipv6-prevalidation
     run_if_changed: .*packages-list.*
@@ -558,8 +558,8 @@ presubmits:
   - agent: kubernetes
     always_run: false
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build05
     context: ci/prow/prevalidation-e2e-metal-ipi-virtualmedia-prevalidation
     decorate: true
@@ -576,7 +576,7 @@ presubmits:
       ci-operator.openshift.io/variant: prevalidation
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-image-master-prevalidation-e2e-metal-ipi-virtualmedia-prevalidation
+    name: pull-ci-openshift-priv-ironic-image-main-prevalidation-e2e-metal-ipi-virtualmedia-prevalidation
     path_alias: github.com/openshift/ironic-image
     rerun_command: /test prevalidation-e2e-metal-ipi-virtualmedia-prevalidation
     run_if_changed: .*packages-list.*
@@ -645,9 +645,9 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build05
+    - ^main$
+    - ^main-
+    cluster: build03
     context: ci/prow/prevalidation-images
     decorate: true
     decoration_config:
@@ -659,7 +659,7 @@ presubmits:
       ci-operator.openshift.io/variant: prevalidation
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-ironic-image-master-prevalidation-images
+    name: pull-ci-openshift-priv-ironic-image-main-prevalidation-images
     path_alias: github.com/openshift/ironic-image
     rerun_command: /test prevalidation-images
     spec:

diff --git a/...hift-ironic-image-master-postsubmits.yaml → ...nshift-ironic-image-main-postsubmits.yaml b/...hift-ironic-image-master-postsubmits.yaml → ...nshift-ironic-image-main-postsubmits.yaml
@@ -3,14 +3,14 @@ postsubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    cluster: build09
+    - ^main$
+    cluster: build03
     decorate: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-ironic-image-master-images
+    name: branch-ci-openshift-ironic-image-main-images
     spec:
       containers:
       - args:
@@ -61,8 +61,8 @@ postsubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    cluster: build09
+    - ^main$
+    cluster: build03
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -71,7 +71,7 @@ postsubmits:
       ci-operator.openshift.io/variant: okd-scos
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-ironic-image-master-okd-scos-images
+    name: branch-ci-openshift-ironic-image-main-okd-scos-images
     spec:
       containers:
       - args:
@@ -123,15 +123,15 @@ postsubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    cluster: build09
+    - ^main$
+    cluster: build03
     decorate: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci-operator.openshift.io/variant: prevalidation
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
-    name: branch-ci-openshift-ironic-image-master-prevalidation-images
+    name: branch-ci-openshift-ironic-image-main-prevalidation-images
     spec:
       containers:
       - args: