diff --git a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-master.yaml b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-main.yaml similarity index 98% rename from ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-master.yaml rename to ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-main.yaml index 946d07a3bbe14..94874eac10f78 100644 --- a/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-api/openshift-priv-cluster-api-main.yaml @@ -185,7 +185,7 @@ tests: workflow: cucushift-installer-rehearse-aws-ipi - as: verify-commits commands: | - commitchecker --start ${PULL_BASE_SHA:-master} + commitchecker --start ${PULL_BASE_SHA:-main} container: from: commitchecker optional: true @@ -196,6 +196,6 @@ tests: test: - ref: go-verify-deps zz_generated_metadata: - branch: master + branch: main org: openshift-priv repo: cluster-api diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-main.yaml similarity index 98% rename from ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml rename to ci-operator/config/openshift/cluster-api/openshift-cluster-api-main.yaml index 3db3e698a4cc1..34c61d7616b89 100644 --- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master.yaml +++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-main.yaml @@ -185,7 +185,7 @@ tests: workflow: cucushift-installer-rehearse-aws-ipi - as: verify-commits commands: | - commitchecker --start ${PULL_BASE_SHA:-master} + commitchecker --start ${PULL_BASE_SHA:-main} container: from: commitchecker optional: true @@ -196,6 +196,6 @@ tests: test: - ref: go-verify-deps zz_generated_metadata: - branch: master + branch: main org: openshift repo: cluster-api diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master__okd-scos.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-main__okd-scos.yaml similarity index 98% rename from ci-operator/config/openshift/cluster-api/openshift-cluster-api-master__okd-scos.yaml rename to ci-operator/config/openshift/cluster-api/openshift-cluster-api-main__okd-scos.yaml index fa1884cfd51b0..8f13b1cf1f801 100644 --- a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master__okd-scos.yaml +++ b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-main__okd-scos.yaml @@ -47,7 +47,7 @@ tests: cluster_profile: aws workflow: openshift-e2e-aws zz_generated_metadata: - branch: master + branch: main org: openshift repo: cluster-api variant: okd-scos diff --git a/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-master-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-main-postsubmits.yaml similarity index 95% rename from ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-master-postsubmits.yaml rename to ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-main-postsubmits.yaml index 36e25e8c227a9..1a52b11c6b445 100644 --- a/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-main-postsubmits.yaml @@ -3,8 +3,8 @@ postsubmits: - agent: kubernetes always_run: true branches: - - ^master$ - cluster: build09 + - ^main$ + cluster: build01 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-api-master-images + name: branch-ci-openshift-priv-cluster-api-main-images path_alias: sigs.k8s.io/cluster-api spec: containers: diff --git a/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-main-presubmits.yaml similarity index 95% rename from ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-master-presubmits.yaml rename to ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-main-presubmits.yaml index 5d7ccdc11b7da..bb14de6c694e9 100644 --- a/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-api/openshift-priv-cluster-api-main-presubmits.yaml @@ -3,9 +3,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build10 context: ci/prow/e2e-aws-capi-techpreview decorate: true decoration_config: @@ -18,7 +18,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-api-main-e2e-aws-capi-techpreview path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-aws-capi-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -86,9 +86,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build10 context: ci/prow/e2e-aws-ovn decorate: true decoration_config: @@ -101,7 +101,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-e2e-aws-ovn + name: pull-ci-openshift-priv-cluster-api-main-e2e-aws-ovn path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-aws-ovn skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -169,9 +169,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build10 context: ci/prow/e2e-aws-ovn-techpreview decorate: true decoration_config: @@ -184,7 +184,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-e2e-aws-ovn-techpreview + name: pull-ci-openshift-priv-cluster-api-main-e2e-aws-ovn-techpreview path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-aws-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -252,9 +252,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build10 context: ci/prow/e2e-aws-serial-1of2 decorate: true decoration_config: @@ -267,7 +267,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-5 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-e2e-aws-serial-1of2 + name: pull-ci-openshift-priv-cluster-api-main-e2e-aws-serial-1of2 path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-aws-serial-1of2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -336,9 +336,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build10 context: ci/prow/e2e-aws-serial-2of2 decorate: true decoration_config: @@ -351,7 +351,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-5 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-e2e-aws-serial-2of2 + name: pull-ci-openshift-priv-cluster-api-main-e2e-aws-serial-2of2 path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-aws-serial-2of2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -420,8 +420,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build01 context: ci/prow/e2e-azure-capi-techpreview decorate: true @@ -435,7 +435,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-e2e-azure-capi-techpreview + name: pull-ci-openshift-priv-cluster-api-main-e2e-azure-capi-techpreview path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-azure-capi-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -503,9 +503,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build04 + - ^main$ + - ^main- + cluster: build08 context: ci/prow/e2e-gcp-capi-techpreview decorate: true decoration_config: @@ -518,7 +518,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-e2e-gcp-capi-techpreview + name: pull-ci-openshift-priv-cluster-api-main-e2e-gcp-capi-techpreview path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-gcp-capi-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -586,8 +586,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build01 context: ci/prow/e2e-hypershift decorate: true @@ -601,7 +601,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: hypershift ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-e2e-hypershift + name: pull-ci-openshift-priv-cluster-api-main-e2e-hypershift path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-hypershift skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -669,9 +669,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build10 context: ci/prow/e2e-openstack-capi-techpreview decorate: true decoration_config: @@ -684,7 +684,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-e2e-openstack-capi-techpreview + name: pull-ci-openshift-priv-cluster-api-main-e2e-openstack-capi-techpreview path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-openstack-capi-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -752,8 +752,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: vsphere02 context: ci/prow/e2e-vsphere-capi-techpreview decorate: true @@ -767,7 +767,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-e2e-vsphere-capi-techpreview + name: pull-ci-openshift-priv-cluster-api-main-e2e-vsphere-capi-techpreview path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-vsphere-capi-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -835,8 +835,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: vsphere02 context: ci/prow/e2e-vsphere-staticip-ipam-ovn decorate: true @@ -850,7 +850,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-e2e-vsphere-staticip-ipam-ovn + name: pull-ci-openshift-priv-cluster-api-main-e2e-vsphere-staticip-ipam-ovn path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-vsphere-staticip-ipam-ovn skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -918,8 +918,8 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build01 context: ci/prow/images decorate: true @@ -931,7 +931,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-images + name: pull-ci-openshift-priv-cluster-api-main-images path_alias: sigs.k8s.io/cluster-api rerun_command: /test images spec: @@ -981,9 +981,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build10 context: ci/prow/regression-clusterinfra-aws-ipi-techpreview-capi decorate: true decoration_config: @@ -996,7 +996,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-5 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-regression-clusterinfra-aws-ipi-techpreview-capi + name: pull-ci-openshift-priv-cluster-api-main-regression-clusterinfra-aws-ipi-techpreview-capi optional: true path_alias: sigs.k8s.io/cluster-api rerun_command: /test regression-clusterinfra-aws-ipi-techpreview-capi @@ -1065,8 +1065,8 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build01 context: ci/prow/unit decorate: true @@ -1078,7 +1078,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-unit + name: pull-ci-openshift-priv-cluster-api-main-unit path_alias: sigs.k8s.io/cluster-api rerun_command: /test unit spec: @@ -1128,8 +1128,8 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build01 context: ci/prow/verify-commits decorate: true @@ -1141,7 +1141,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-verify-commits + name: pull-ci-openshift-priv-cluster-api-main-verify-commits optional: true path_alias: sigs.k8s.io/cluster-api rerun_command: /test verify-commits @@ -1192,8 +1192,8 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build01 context: ci/prow/verify-deps decorate: true @@ -1205,7 +1205,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-master-verify-deps + name: pull-ci-openshift-priv-cluster-api-main-verify-deps path_alias: sigs.k8s.io/cluster-api rerun_command: /test verify-deps spec: diff --git a/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-master-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-main-postsubmits.yaml similarity index 94% rename from ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-master-postsubmits.yaml rename to ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-main-postsubmits.yaml index b5c04f4eb48e8..12bfec1b45b79 100644 --- a/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-main-postsubmits.yaml @@ -3,14 +3,14 @@ postsubmits: - agent: kubernetes always_run: true branches: - - ^master$ - cluster: build08 + - ^main$ + cluster: build01 decorate: true labels: ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-openshift-cluster-api-master-images + name: branch-ci-openshift-cluster-api-main-images path_alias: sigs.k8s.io/cluster-api spec: containers: @@ -62,8 +62,8 @@ postsubmits: - agent: kubernetes always_run: true branches: - - ^master$ - cluster: build08 + - ^main$ + cluster: build01 decorate: true decoration_config: skip_cloning: true @@ -72,7 +72,7 @@ postsubmits: ci-operator.openshift.io/variant: okd-scos ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-openshift-cluster-api-master-okd-scos-images + name: branch-ci-openshift-cluster-api-main-okd-scos-images spec: containers: - args: diff --git a/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-main-presubmits.yaml similarity index 95% rename from ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-master-presubmits.yaml rename to ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-main-presubmits.yaml index a58019d6da934..4ab88177c14e6 100644 --- a/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-main-presubmits.yaml @@ -3,9 +3,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build06 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/e2e-aws-capi-techpreview decorate: true labels: @@ -13,7 +13,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-e2e-aws-capi-techpreview + name: pull-ci-openshift-cluster-api-main-e2e-aws-capi-techpreview path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-aws-capi-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -77,9 +77,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build06 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/e2e-aws-ovn decorate: true labels: @@ -87,7 +87,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-2 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-e2e-aws-ovn + name: pull-ci-openshift-cluster-api-main-e2e-aws-ovn path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-aws-ovn skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -151,9 +151,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build06 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/e2e-aws-ovn-techpreview decorate: true labels: @@ -161,7 +161,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-e2e-aws-ovn-techpreview + name: pull-ci-openshift-cluster-api-main-e2e-aws-ovn-techpreview path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-aws-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -225,9 +225,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build06 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/e2e-aws-serial-1of2 decorate: true labels: @@ -235,7 +235,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-5 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-e2e-aws-serial-1of2 + name: pull-ci-openshift-cluster-api-main-e2e-aws-serial-1of2 path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-aws-serial-1of2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -300,9 +300,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build06 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/e2e-aws-serial-2of2 decorate: true labels: @@ -310,7 +310,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-5 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-e2e-aws-serial-2of2 + name: pull-ci-openshift-cluster-api-main-e2e-aws-serial-2of2 path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-aws-serial-2of2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -375,9 +375,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build04 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/e2e-azure-capi-techpreview decorate: true labels: @@ -385,7 +385,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-e2e-azure-capi-techpreview + name: pull-ci-openshift-cluster-api-main-e2e-azure-capi-techpreview path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-azure-capi-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -449,9 +449,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build08 + - ^main$ + - ^main- + cluster: build02 context: ci/prow/e2e-gcp-capi-techpreview decorate: true labels: @@ -459,7 +459,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-e2e-gcp-capi-techpreview + name: pull-ci-openshift-cluster-api-main-e2e-gcp-capi-techpreview path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-gcp-capi-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -523,9 +523,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build04 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/e2e-hypershift decorate: true labels: @@ -533,7 +533,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: hypershift ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-e2e-hypershift + name: pull-ci-openshift-cluster-api-main-e2e-hypershift path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-hypershift skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -597,9 +597,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build06 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/e2e-openstack-capi-techpreview decorate: true labels: @@ -607,7 +607,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-e2e-openstack-capi-techpreview + name: pull-ci-openshift-cluster-api-main-e2e-openstack-capi-techpreview path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-openstack-capi-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -671,8 +671,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: vsphere02 context: ci/prow/e2e-vsphere-capi-techpreview decorate: true @@ -681,7 +681,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-e2e-vsphere-capi-techpreview + name: pull-ci-openshift-cluster-api-main-e2e-vsphere-capi-techpreview path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-vsphere-capi-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -745,8 +745,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: vsphere02 context: ci/prow/e2e-vsphere-staticip-ipam-ovn decorate: true @@ -755,7 +755,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-e2e-vsphere-staticip-ipam-ovn + name: pull-ci-openshift-cluster-api-main-e2e-vsphere-staticip-ipam-ovn path_alias: sigs.k8s.io/cluster-api rerun_command: /test e2e-vsphere-staticip-ipam-ovn skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -819,15 +819,15 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build04 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/images decorate: true labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-images + name: pull-ci-openshift-cluster-api-main-images path_alias: sigs.k8s.io/cluster-api rerun_command: /test images spec: @@ -874,9 +874,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build06 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/okd-scos-e2e-aws-ovn decorate: true decoration_config: @@ -887,7 +887,7 @@ presubmits: ci-operator.openshift.io/variant: okd-scos ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-okd-scos-e2e-aws-ovn + name: pull-ci-openshift-cluster-api-main-okd-scos-e2e-aws-ovn optional: true rerun_command: /test okd-scos-e2e-aws-ovn spec: @@ -951,9 +951,9 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build04 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/okd-scos-images decorate: true decoration_config: @@ -962,7 +962,7 @@ presubmits: ci-operator.openshift.io/variant: okd-scos ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-okd-scos-images + name: pull-ci-openshift-cluster-api-main-okd-scos-images rerun_command: /test okd-scos-images spec: containers: @@ -1009,9 +1009,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build06 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/regression-clusterinfra-aws-ipi-techpreview-capi decorate: true labels: @@ -1019,7 +1019,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-5 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-regression-clusterinfra-aws-ipi-techpreview-capi + name: pull-ci-openshift-cluster-api-main-regression-clusterinfra-aws-ipi-techpreview-capi optional: true path_alias: sigs.k8s.io/cluster-api rerun_command: /test regression-clusterinfra-aws-ipi-techpreview-capi @@ -1084,15 +1084,15 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build04 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/unit decorate: true labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-unit + name: pull-ci-openshift-cluster-api-main-unit path_alias: sigs.k8s.io/cluster-api rerun_command: /test unit spec: @@ -1138,15 +1138,15 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build04 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/verify-commits decorate: true labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-verify-commits + name: pull-ci-openshift-cluster-api-main-verify-commits optional: true path_alias: sigs.k8s.io/cluster-api rerun_command: /test verify-commits @@ -1193,15 +1193,15 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build04 + - ^main$ + - ^main- + cluster: build01 context: ci/prow/verify-deps decorate: true labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-master-verify-deps + name: pull-ci-openshift-cluster-api-main-verify-deps path_alias: sigs.k8s.io/cluster-api rerun_command: /test verify-deps spec: