diff --git a/ci-operator/config/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-master.yaml b/ci-operator/config/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-main.yaml
similarity index 99%
rename from ci-operator/config/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-master.yaml
rename to ci-operator/config/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-main.yaml
index 19d451d394ee..10219005ae67 100644
--- a/ci-operator/config/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-master.yaml
+++ b/ci-operator/config/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-main.yaml
@@ -73,6 +73,6 @@ tests:
cpu: 100m
workflow: ipi-gcp
zz_generated_metadata:
- branch: master
+ branch: main
org: openshift-priv
repo: oauth-proxy
diff --git a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-main.yaml
similarity index 99%
rename from ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml
rename to ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-main.yaml
index b740b218fe47..e9346bbafbc4 100644
--- a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master.yaml
+++ b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-main.yaml
@@ -72,6 +72,6 @@ tests:
cpu: 100m
workflow: ipi-gcp
zz_generated_metadata:
- branch: master
+ branch: main
org: openshift
repo: oauth-proxy
diff --git a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master__okd-scos.yaml b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-main__okd-scos.yaml
similarity index 98%
rename from ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master__okd-scos.yaml
rename to ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-main__okd-scos.yaml
index 42f1551c8e5d..c1789156ae4a 100644
--- a/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-master__okd-scos.yaml
+++ b/ci-operator/config/openshift/oauth-proxy/openshift-oauth-proxy-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: oauth-proxy
variant: okd-scos
diff --git a/ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-master-postsubmits.yaml b/ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-main-postsubmits.yaml
similarity index 95%
rename from ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-master-postsubmits.yaml
rename to ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-main-postsubmits.yaml
index dbc7b914c898..6d21d8ebb6d4 100644
--- a/ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-master-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-main-postsubmits.yaml
@@ -3,8 +3,8 @@ postsubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- cluster: build07
+ - ^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-oauth-proxy-master-images
+ name: branch-ci-openshift-priv-oauth-proxy-main-images
path_alias: github.com/openshift/oauth-proxy
spec:
containers:
diff --git a/ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-main-presubmits.yaml
similarity index 95%
rename from ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-master-presubmits.yaml
rename to ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-main-presubmits.yaml
index 395d348ec987..6d01f745caf7 100644
--- a/ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/oauth-proxy/openshift-priv-oauth-proxy-main-presubmits.yaml
@@ -3,9 +3,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- - ^master-
- cluster: build01
+ - ^main$
+ - ^main-
+ cluster: build09
context: ci/prow/e2e-aws
decorate: true
decoration_config:
@@ -18,7 +18,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: aws
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
- name: pull-ci-openshift-priv-oauth-proxy-master-e2e-aws
+ name: pull-ci-openshift-priv-oauth-proxy-main-e2e-aws
path_alias: github.com/openshift/oauth-proxy
rerun_command: /test e2e-aws
spec:
@@ -85,8 +85,8 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- - ^master-
+ - ^main$
+ - ^main-
cluster: build02
context: ci/prow/e2e-component
decorate: true
@@ -100,7 +100,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-oauth-proxy-master-e2e-component
+ name: pull-ci-openshift-priv-oauth-proxy-main-e2e-component
path_alias: github.com/openshift/oauth-proxy
rerun_command: /test e2e-component
spec:
@@ -167,9 +167,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- - ^master-
- cluster: build02
+ - ^main$
+ - ^main-
+ cluster: build03
context: ci/prow/images
decorate: true
decoration_config:
@@ -180,7 +180,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
- name: pull-ci-openshift-priv-oauth-proxy-master-images
+ name: pull-ci-openshift-priv-oauth-proxy-main-images
path_alias: github.com/openshift/oauth-proxy
rerun_command: /test images
spec:
@@ -230,9 +230,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- - ^master-
- cluster: build02
+ - ^main$
+ - ^main-
+ cluster: build03
context: ci/prow/unit
decorate: true
decoration_config:
@@ -243,7 +243,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
- name: pull-ci-openshift-priv-oauth-proxy-master-unit
+ name: pull-ci-openshift-priv-oauth-proxy-main-unit
path_alias: github.com/openshift/oauth-proxy
rerun_command: /test unit
spec:
@@ -293,9 +293,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- - ^master-
- cluster: build02
+ - ^main$
+ - ^main-
+ cluster: build03
context: ci/prow/verify
decorate: true
decoration_config:
@@ -306,7 +306,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
- name: pull-ci-openshift-priv-oauth-proxy-master-verify
+ name: pull-ci-openshift-priv-oauth-proxy-main-verify
path_alias: github.com/openshift/oauth-proxy
rerun_command: /test verify
spec:
@@ -356,9 +356,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- - ^master-
- cluster: build02
+ - ^main$
+ - ^main-
+ cluster: build03
context: ci/prow/verify-deps
decorate: true
decoration_config:
@@ -369,7 +369,7 @@ presubmits:
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
- name: pull-ci-openshift-priv-oauth-proxy-master-verify-deps
+ name: pull-ci-openshift-priv-oauth-proxy-main-verify-deps
path_alias: github.com/openshift/oauth-proxy
rerun_command: /test verify-deps
spec:
diff --git a/ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-master-postsubmits.yaml b/ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-main-postsubmits.yaml
similarity index 94%
rename from ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-master-postsubmits.yaml
rename to ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-main-postsubmits.yaml
index 5d2cfd3a9d8d..c3ae28ef8d3d 100644
--- a/ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-master-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-main-postsubmits.yaml
@@ -3,14 +3,14 @@ postsubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- cluster: build07
+ - ^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-oauth-proxy-master-images
+ name: branch-ci-openshift-oauth-proxy-main-images
spec:
containers:
- args:
@@ -61,8 +61,8 @@ postsubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- cluster: build07
+ - ^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-oauth-proxy-master-okd-scos-images
+ name: branch-ci-openshift-oauth-proxy-main-okd-scos-images
spec:
containers:
- args:
diff --git a/ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-master-presubmits.yaml b/ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-main-presubmits.yaml
similarity index 94%
rename from ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-master-presubmits.yaml
rename to ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-main-presubmits.yaml
index 48b66a0ff8ab..2b0eeb9fd0fd 100644
--- a/ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/oauth-proxy/openshift-oauth-proxy-main-presubmits.yaml
@@ -3,9 +3,9 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- - ^master-
- cluster: build05
+ - ^main$
+ - ^main-
+ cluster: build01
context: ci/prow/e2e-aws
decorate: true
labels:
@@ -13,7 +13,7 @@ presubmits:
ci-operator.openshift.io/cloud-cluster-profile: aws
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
- name: pull-ci-openshift-oauth-proxy-master-e2e-aws
+ name: pull-ci-openshift-oauth-proxy-main-e2e-aws
rerun_command: /test e2e-aws
spec:
containers:
@@ -75,8 +75,8 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- - ^master-
+ - ^main$
+ - ^main-
cluster: build02
context: ci/prow/e2e-component
decorate: true
@@ -85,7 +85,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-oauth-proxy-master-e2e-component
+ name: pull-ci-openshift-oauth-proxy-main-e2e-component
rerun_command: /test e2e-component
spec:
containers:
@@ -147,15 +147,15 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- - ^master-
- cluster: build11
+ - ^main$
+ - ^main-
+ cluster: build03
context: ci/prow/images
decorate: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
- name: pull-ci-openshift-oauth-proxy-master-images
+ name: pull-ci-openshift-oauth-proxy-main-images
rerun_command: /test images
spec:
containers:
@@ -201,9 +201,9 @@ presubmits:
- agent: kubernetes
always_run: false
branches:
- - ^master$
- - ^master-
- cluster: build05
+ - ^main$
+ - ^main-
+ cluster: build01
context: ci/prow/okd-scos-e2e-aws-ovn
decorate: true
decoration_config:
@@ -214,7 +214,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-oauth-proxy-master-okd-scos-e2e-aws-ovn
+ name: pull-ci-openshift-oauth-proxy-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)$
@@ -277,11 +277,11 @@ presubmits:
secretName: result-aggregator
trigger: (?m)^/test( | .* )okd-scos-e2e-aws-ovn,?($|\s.*)
- agent: kubernetes
- always_run: false
+ always_run: true
branches:
- - ^master$
- - ^master-
- cluster: build11
+ - ^main$
+ - ^main-
+ cluster: build03
context: ci/prow/okd-scos-images
decorate: true
decoration_config:
@@ -290,8 +290,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-oauth-proxy-master-okd-scos-images
- optional: true
+ name: pull-ci-openshift-oauth-proxy-main-okd-scos-images
rerun_command: /test okd-scos-images
spec:
containers:
@@ -338,15 +337,15 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- - ^master-
- cluster: build11
+ - ^main$
+ - ^main-
+ cluster: build03
context: ci/prow/unit
decorate: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
- name: pull-ci-openshift-oauth-proxy-master-unit
+ name: pull-ci-openshift-oauth-proxy-main-unit
rerun_command: /test unit
spec:
containers:
@@ -391,15 +390,15 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- - ^master-
- cluster: build11
+ - ^main$
+ - ^main-
+ cluster: build03
context: ci/prow/verify
decorate: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
- name: pull-ci-openshift-oauth-proxy-master-verify
+ name: pull-ci-openshift-oauth-proxy-main-verify
rerun_command: /test verify
spec:
containers:
@@ -444,15 +443,15 @@ presubmits:
- agent: kubernetes
always_run: true
branches:
- - ^master$
- - ^master-
- cluster: build11
+ - ^main$
+ - ^main-
+ cluster: build03
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-oauth-proxy-master-verify-deps
+ name: pull-ci-openshift-oauth-proxy-main-verify-deps
rerun_command: /test verify-deps
spec:
containers: