diff --git a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master.yaml b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main.yaml similarity index 98% rename from ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master.yaml rename to ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main.yaml index 6f6e8f3f793c3..eb95b80568209 100644 --- a/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main.yaml @@ -122,7 +122,7 @@ tests: workflow: hypershift-aws-e2e-external - as: verify-commits commands: | - commitchecker --start ${PULL_BASE_SHA:-master} + commitchecker --start ${PULL_BASE_SHA:-main} container: from: commitchecker optional: true @@ -138,6 +138,6 @@ tests: test: - ref: go-verify-deps zz_generated_metadata: - branch: master + branch: main org: openshift-priv repo: cluster-api-provider-aws diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main.yaml similarity index 98% rename from ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master.yaml rename to ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main.yaml index ce131dc4ed9a7..bdf3747fab856 100644 --- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main.yaml @@ -123,7 +123,7 @@ tests: workflow: hypershift-aws-e2e-external - as: verify-commits commands: | - commitchecker --start ${PULL_BASE_SHA:-master} + commitchecker --start ${PULL_BASE_SHA:-main} container: from: commitchecker optional: true @@ -139,6 +139,6 @@ tests: test: - ref: go-verify-deps zz_generated_metadata: - branch: master + branch: main org: openshift repo: cluster-api-provider-aws diff --git a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master__okd-scos.yaml b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main__okd-scos.yaml similarity index 98% rename from ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master__okd-scos.yaml rename to ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main__okd-scos.yaml index 0ef8b4782a3e7..ddd8892a51ffd 100644 --- a/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master__okd-scos.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main__okd-scos.yaml @@ -48,7 +48,7 @@ tests: cluster_profile: aws workflow: openshift-e2e-aws zz_generated_metadata: - branch: master + branch: main org: openshift repo: cluster-api-provider-aws variant: okd-scos diff --git a/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master-postsubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main-postsubmits.yaml similarity index 95% rename from ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master-postsubmits.yaml rename to ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main-postsubmits.yaml index e74aee5050c7d..3fe90629d1ed0 100644 --- a/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main-postsubmits.yaml @@ -3,8 +3,8 @@ postsubmits: - agent: kubernetes always_run: true branches: - - ^master$ - cluster: build06 + - ^main$ + cluster: build05 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-provider-aws-master-images + name: branch-ci-openshift-priv-cluster-api-provider-aws-main-images path_alias: sigs.k8s.io/cluster-api-provider-aws spec: containers: diff --git a/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main-presubmits.yaml similarity index 94% rename from ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master-presubmits.yaml rename to ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main-presubmits.yaml index 0f5d875d9f141..161a7377b26e4 100644 --- a/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-master-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-api-provider-aws/openshift-priv-cluster-api-provider-aws-main-presubmits.yaml @@ -3,9 +3,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build11 + - ^main$ + - ^main- + cluster: build07 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-provider-aws-master-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-api-provider-aws-main-e2e-aws-capi-techpreview optional: true path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test e2e-aws-capi-techpreview @@ -87,9 +87,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build11 + - ^main$ + - ^main- + cluster: build07 context: ci/prow/e2e-aws-ovn decorate: true decoration_config: @@ -102,7 +102,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-provider-aws-master-e2e-aws-ovn + name: pull-ci-openshift-priv-cluster-api-provider-aws-main-e2e-aws-ovn path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test e2e-aws-ovn skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -170,9 +170,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build11 + - ^main$ + - ^main- + cluster: build07 context: ci/prow/e2e-aws-ovn-techpreview decorate: true decoration_config: @@ -185,7 +185,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-provider-aws-master-e2e-aws-ovn-techpreview + name: pull-ci-openshift-priv-cluster-api-provider-aws-main-e2e-aws-ovn-techpreview optional: true path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test e2e-aws-ovn-techpreview @@ -254,9 +254,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build11 + - ^main$ + - ^main- + cluster: build07 context: ci/prow/e2e-aws-serial decorate: true decoration_config: @@ -269,7 +269,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-provider-aws-master-e2e-aws-serial + name: pull-ci-openshift-priv-cluster-api-provider-aws-main-e2e-aws-serial path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test e2e-aws-serial skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -337,9 +337,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build11 + - ^main$ + - ^main- + cluster: build05 context: ci/prow/e2e-hypershift decorate: true decoration_config: @@ -352,7 +352,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-provider-aws-master-e2e-hypershift + name: pull-ci-openshift-priv-cluster-api-provider-aws-main-e2e-hypershift path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test e2e-hypershift skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -420,9 +420,9 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build11 + - ^main$ + - ^main- + cluster: build05 context: ci/prow/images decorate: true decoration_config: @@ -433,7 +433,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-provider-aws-master-images + name: pull-ci-openshift-priv-cluster-api-provider-aws-main-images path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test images spec: @@ -483,9 +483,9 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build11 + - ^main$ + - ^main- + cluster: build07 context: ci/prow/regression-clusterinfra-aws-ipi-proxy-techpreview decorate: true decoration_config: @@ -498,7 +498,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-provider-aws-master-regression-clusterinfra-aws-ipi-proxy-techpreview + name: pull-ci-openshift-priv-cluster-api-provider-aws-main-regression-clusterinfra-aws-ipi-proxy-techpreview optional: true path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test regression-clusterinfra-aws-ipi-proxy-techpreview @@ -566,9 +566,9 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build11 + - ^main$ + - ^main- + cluster: build05 context: ci/prow/security decorate: true decoration_config: @@ -579,7 +579,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-provider-aws-master-security + name: pull-ci-openshift-priv-cluster-api-provider-aws-main-security path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test security spec: @@ -636,9 +636,9 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build11 + - ^main$ + - ^main- + cluster: build05 context: ci/prow/unit decorate: true decoration_config: @@ -649,7 +649,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-provider-aws-master-unit + name: pull-ci-openshift-priv-cluster-api-provider-aws-main-unit path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test unit spec: @@ -699,9 +699,9 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build11 + - ^main$ + - ^main- + cluster: build05 context: ci/prow/verify-commits decorate: true decoration_config: @@ -712,7 +712,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-provider-aws-master-verify-commits + name: pull-ci-openshift-priv-cluster-api-provider-aws-main-verify-commits optional: true path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test verify-commits @@ -763,9 +763,9 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build11 + - ^main$ + - ^main- + cluster: build05 context: ci/prow/verify-deps decorate: true decoration_config: @@ -776,7 +776,7 @@ presubmits: labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-api-provider-aws-master-verify-deps + name: pull-ci-openshift-priv-cluster-api-provider-aws-main-verify-deps path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test verify-deps spec: diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main-postsubmits.yaml similarity index 95% rename from ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master-postsubmits.yaml rename to ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main-postsubmits.yaml index cf30b68dbcab1..2f96a75ace229 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main-postsubmits.yaml @@ -3,14 +3,14 @@ postsubmits: - agent: kubernetes always_run: true branches: - - ^master$ + - ^main$ cluster: build05 decorate: true labels: ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-openshift-cluster-api-provider-aws-master-images + name: branch-ci-openshift-cluster-api-provider-aws-main-images path_alias: sigs.k8s.io/cluster-api-provider-aws spec: containers: @@ -62,7 +62,7 @@ postsubmits: - agent: kubernetes always_run: true branches: - - ^master$ + - ^main$ cluster: build05 decorate: true decoration_config: @@ -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-provider-aws-master-okd-scos-images + name: branch-ci-openshift-cluster-api-provider-aws-main-okd-scos-images spec: containers: - args: diff --git a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main-presubmits.yaml similarity index 94% rename from ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master-presubmits.yaml rename to ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main-presubmits.yaml index a9383fdac93a5..621a33a4747a0 100644 --- a/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-main-presubmits.yaml @@ -3,9 +3,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build11 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-provider-aws-master-e2e-aws-capi-techpreview + name: pull-ci-openshift-cluster-api-provider-aws-main-e2e-aws-capi-techpreview optional: true path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test e2e-aws-capi-techpreview @@ -78,9 +78,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build11 context: ci/prow/e2e-aws-ovn decorate: true labels: @@ -88,7 +88,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-provider-aws-master-e2e-aws-ovn + name: pull-ci-openshift-cluster-api-provider-aws-main-e2e-aws-ovn path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test e2e-aws-ovn skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -152,9 +152,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build11 context: ci/prow/e2e-aws-ovn-techpreview decorate: true labels: @@ -162,7 +162,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-provider-aws-master-e2e-aws-ovn-techpreview + name: pull-ci-openshift-cluster-api-provider-aws-main-e2e-aws-ovn-techpreview optional: true path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test e2e-aws-ovn-techpreview @@ -227,9 +227,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build11 context: ci/prow/e2e-aws-serial-1of2 decorate: true labels: @@ -237,7 +237,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-provider-aws-master-e2e-aws-serial-1of2 + name: pull-ci-openshift-cluster-api-provider-aws-main-e2e-aws-serial-1of2 path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test e2e-aws-serial-1of2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -302,9 +302,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build11 context: ci/prow/e2e-aws-serial-2of2 decorate: true labels: @@ -312,7 +312,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-provider-aws-master-e2e-aws-serial-2of2 + name: pull-ci-openshift-cluster-api-provider-aws-main-e2e-aws-serial-2of2 path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test e2e-aws-serial-2of2 skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -377,8 +377,8 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build05 context: ci/prow/e2e-hypershift decorate: true @@ -387,7 +387,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-provider-aws-master-e2e-hypershift + name: pull-ci-openshift-cluster-api-provider-aws-main-e2e-hypershift path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test e2e-hypershift skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -451,15 +451,15 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build05 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-provider-aws-master-images + name: pull-ci-openshift-cluster-api-provider-aws-main-images path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test images spec: @@ -506,9 +506,9 @@ presubmits: - agent: kubernetes always_run: false branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build11 context: ci/prow/okd-scos-e2e-aws-ovn decorate: true decoration_config: @@ -519,7 +519,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-provider-aws-master-okd-scos-e2e-aws-ovn + name: pull-ci-openshift-cluster-api-provider-aws-main-okd-scos-e2e-aws-ovn optional: true rerun_command: /test okd-scos-e2e-aws-ovn skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ @@ -582,10 +582,10 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )okd-scos-e2e-aws-ovn,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build05 context: ci/prow/okd-scos-images decorate: true @@ -595,8 +595,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-provider-aws-master-okd-scos-images - optional: true + name: pull-ci-openshift-cluster-api-provider-aws-main-okd-scos-images rerun_command: /test okd-scos-images spec: containers: @@ -643,9 +642,9 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- - cluster: build03 + - ^main$ + - ^main- + cluster: build11 context: ci/prow/regression-clusterinfra-aws-ipi-proxy-techpreview decorate: true labels: @@ -653,7 +652,7 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws-3 ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-provider-aws-master-regression-clusterinfra-aws-ipi-proxy-techpreview + name: pull-ci-openshift-cluster-api-provider-aws-main-regression-clusterinfra-aws-ipi-proxy-techpreview optional: true path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test regression-clusterinfra-aws-ipi-proxy-techpreview @@ -717,15 +716,15 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build05 context: ci/prow/security decorate: true labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-api-provider-aws-master-security + name: pull-ci-openshift-cluster-api-provider-aws-main-security path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test security spec: @@ -778,15 +777,15 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build05 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-provider-aws-master-unit + name: pull-ci-openshift-cluster-api-provider-aws-main-unit path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test unit spec: @@ -832,15 +831,15 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build05 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-provider-aws-master-verify-commits + name: pull-ci-openshift-cluster-api-provider-aws-main-verify-commits optional: true path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test verify-commits @@ -887,15 +886,15 @@ presubmits: - agent: kubernetes always_run: true branches: - - ^master$ - - ^master- + - ^main$ + - ^main- cluster: build05 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-provider-aws-master-verify-deps + name: pull-ci-openshift-cluster-api-provider-aws-main-verify-deps path_alias: sigs.k8s.io/cluster-api-provider-aws rerun_command: /test verify-deps spec: