Repository: openshift/release
Pull request #62904: OCPBUGS-53195: rename 'master' to 'main' for router
Author: login: DennisPeriquet
Labels: name: lgtm
description: Indicates that a PR is ready to be merged.
name: approved
description: Indicates a PR has been approved by an approver from all required OWNERS files.
name: qe-approved
description: Signifies that QE has signed off on this PR
name: jira/valid-bug
description: Indicates that a referenced Jira bug is valid for the branch this PR is targeting.
name: rehearsals-ack
description: Signifies that rehearsal jobs have been acknowledged
name: jira/valid-reference
description: Indicates that this PR references a valid Jira ticket of any type.
Created: 2025-03-17T15:18:50Z | Merged: 2025-03-20T20:25:45Z


This PR is in support of renaming the default branch for https://github.com/openshift/router from 'master' to 'main'.

Unhold this PR only when:

* the default branch for https://github.com/openshift/router has been renamed to 'main'
* You have verified that the CI jobs are working as expected either by running '/pj-rehearse' or by inspection.

/hold



Diff:
diff --git a/ci-operator/config/openshift-priv/router/openshift-priv-router-master.yaml b/ci-operator/config/openshift-priv/router/openshift-priv-router-main.yaml
similarity index 98%
rename from ci-operator/config/openshift-priv/router/openshift-priv-router-master.yaml
rename to ci-operator/config/openshift-priv/router/openshift-priv-router-main.yaml
index eada4b43da238..ba9cf0de64aae 100644
--- a/ci-operator/config/openshift-priv/router/openshift-priv-router-master.yaml
+++ b/ci-operator/config/openshift-priv/router/openshift-priv-router-main.yaml
@@ -107,7 +107,7 @@ tests:
         echo "************ baremetalds e2e router conf command ************"
 
         read -d '#' INCL << EOF
-        [sig-network] Services should provide secure master service
+        [sig-network] Services should provide secure main service
         [sig-api-machinery] Watchers should be able to start watching from a specific resource version
         [sig-network-edge][Conformance][Area:Networking][Feature:Router] The HAProxy router should pass the gRPC interoperability tests [Suite:openshift/conformance/parallel/minimal]
         [sig-network-edge][Conformance][Area:Networking][Feature:Router] The HAProxy router should pass the h2spec conformance tests [Suite:openshift/conformance/parallel/minimal]
@@ -186,6 +186,6 @@ tests:
     - chain: openshift-qe-ingress-perf
   timeout: 5h0m0s
 zz_generated_metadata:
-  branch: master
+  branch: main
   org: openshift-priv
   repo: router
diff --git a/ci-operator/config/openshift/router/openshift-router-master.yaml b/ci-operator/config/openshift/router/openshift-router-main.yaml
similarity index 99%
rename from ci-operator/config/openshift/router/openshift-router-master.yaml
rename to ci-operator/config/openshift/router/openshift-router-main.yaml
index dfe6ea9fe6f48..63698abff0e62 100644
--- a/ci-operator/config/openshift/router/openshift-router-master.yaml
+++ b/ci-operator/config/openshift/router/openshift-router-main.yaml
@@ -185,6 +185,6 @@ tests:
     - chain: openshift-qe-ingress-perf
   timeout: 5h0m0s
 zz_generated_metadata:
-  branch: master
+  branch: main
   org: openshift
   repo: router
diff --git a/ci-operator/config/openshift/router/openshift-router-master__okd-scos.yaml b/ci-operator/config/openshift/router/openshift-router-main__okd-scos.yaml
similarity index 98%
rename from ci-operator/config/openshift/router/openshift-router-master__okd-scos.yaml
rename to ci-operator/config/openshift/router/openshift-router-main__okd-scos.yaml
index a8f2d3a8af5bb..cfefd519c5c6a 100644
--- a/ci-operator/config/openshift/router/openshift-router-master__okd-scos.yaml
+++ b/ci-operator/config/openshift/router/openshift-router-main__okd-scos.yaml
@@ -54,7 +54,7 @@ tests:
     cluster_profile: aws
     workflow: openshift-e2e-aws
 zz_generated_metadata:
-  branch: master
+  branch: main
   org: openshift
   repo: router
   variant: okd-scos
diff --git a/ci-operator/jobs/openshift-priv/router/openshift-priv-router-master-postsubmits.yaml b/ci-operator/jobs/openshift-priv/router/openshift-priv-router-main-postsubmits.yaml
similarity index 95%
rename from ci-operator/jobs/openshift-priv/router/openshift-priv-router-master-postsubmits.yaml
rename to ci-operator/jobs/openshift-priv/router/openshift-priv-router-main-postsubmits.yaml
index 5db2037bf85b8..28f0d2cd28362 100644
--- a/ci-operator/jobs/openshift-priv/router/openshift-priv-router-master-postsubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/router/openshift-priv-router-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-router-master-images
+    name: branch-ci-openshift-priv-router-main-images
     path_alias: github.com/openshift/router
     spec:
       containers:
diff --git a/ci-operator/jobs/openshift-priv/router/openshift-priv-router-master-presubmits.yaml b/ci-operator/jobs/openshift-priv/router/openshift-priv-router-main-presubmits.yaml
similarity index 95%
rename from ci-operator/jobs/openshift-priv/router/openshift-priv-router-master-presubmits.yaml
rename to ci-operator/jobs/openshift-priv/router/openshift-priv-router-main-presubmits.yaml
index 768492439b34b..7d10475860de7 100644
--- a/ci-operator/jobs/openshift-priv/router/openshift-priv-router-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift-priv/router/openshift-priv-router-main-presubmits.yaml
@@ -3,8 +3,8 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build02
     context: ci/prow/e2e-agnostic
     decorate: true
@@ -18,7 +18,7 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-3
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-router-master-e2e-agnostic
+    name: pull-ci-openshift-priv-router-main-e2e-agnostic
     path_alias: github.com/openshift/router
     rerun_command: /test e2e-agnostic
     spec:
@@ -85,9 +85,9 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build05
+    - ^main$
+    - ^main-
+    cluster: build01
     context: ci/prow/e2e-aws-serial
     decorate: true
     decoration_config:
@@ -100,7 +100,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-router-master-e2e-aws-serial
+    name: pull-ci-openshift-priv-router-main-e2e-aws-serial
     path_alias: github.com/openshift/router
     rerun_command: /test e2e-aws-serial
     spec:
@@ -167,8 +167,8 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build05
     context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
@@ -183,7 +183,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-router-master-e2e-metal-ipi-ovn-dualstack
+    name: pull-ci-openshift-priv-router-main-e2e-metal-ipi-ovn-dualstack
     optional: true
     path_alias: github.com/openshift/router
     rerun_command: /test e2e-metal-ipi-ovn-dualstack
@@ -251,8 +251,8 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build05
     context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
@@ -267,7 +267,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-router-master-e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-priv-router-main-e2e-metal-ipi-ovn-ipv6
     optional: true
     path_alias: github.com/openshift/router
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
@@ -335,8 +335,8 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build05
     context: ci/prow/e2e-metal-ipi-ovn-router
     decorate: true
@@ -351,7 +351,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-router-master-e2e-metal-ipi-ovn-router
+    name: pull-ci-openshift-priv-router-main-e2e-metal-ipi-ovn-router
     optional: true
     path_alias: github.com/openshift/router
     rerun_command: /test e2e-metal-ipi-ovn-router
@@ -419,9 +419,9 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build05
+    - ^main$
+    - ^main-
+    cluster: build03
     context: ci/prow/e2e-upgrade
     decorate: true
     decoration_config:
@@ -434,7 +434,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-router-master-e2e-upgrade
+    name: pull-ci-openshift-priv-router-main-e2e-upgrade
     path_alias: github.com/openshift/router
     rerun_command: /test e2e-upgrade
     spec:
@@ -501,9 +501,9 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build05
+    - ^main$
+    - ^main-
+    cluster: build03
     context: ci/prow/images
     decorate: true
     decoration_config:
@@ -514,7 +514,7 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-router-master-images
+    name: pull-ci-openshift-priv-router-main-images
     path_alias: github.com/openshift/router
     rerun_command: /test images
     spec:
@@ -564,9 +564,9 @@ presubmits:
   - agent: kubernetes
     always_run: false
     branches:
-    - ^master$
-    - ^master-
-    cluster: build05
+    - ^main$
+    - ^main-
+    cluster: build01
     context: ci/prow/perfscale-aws-fips-ingress-perf
     decorate: true
     decoration_config:
@@ -580,7 +580,7 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-router-master-perfscale-aws-fips-ingress-perf
+    name: pull-ci-openshift-priv-router-main-perfscale-aws-fips-ingress-perf
     optional: true
     path_alias: github.com/openshift/router
     rerun_command: /test perfscale-aws-fips-ingress-perf
@@ -648,9 +648,9 @@ presubmits:
   - agent: kubernetes
     always_run: false
     branches:
-    - ^master$
-    - ^master-
-    cluster: build05
+    - ^main$
+    - ^main-
+    cluster: build01
     context: ci/prow/perfscale-aws-ingress-perf
     decorate: true
     decoration_config:
@@ -664,7 +664,7 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-router-master-perfscale-aws-ingress-perf
+    name: pull-ci-openshift-priv-router-main-perfscale-aws-ingress-perf
     optional: true
     path_alias: github.com/openshift/router
     rerun_command: /test perfscale-aws-ingress-perf
@@ -732,9 +732,9 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build05
+    - ^main$
+    - ^main-
+    cluster: build03
     context: ci/prow/unit
     decorate: true
     decoration_config:
@@ -745,7 +745,7 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-router-master-unit
+    name: pull-ci-openshift-priv-router-main-unit
     path_alias: github.com/openshift/router
     rerun_command: /test unit
     spec:
@@ -795,9 +795,9 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build05
+    - ^main$
+    - ^main-
+    cluster: build03
     context: ci/prow/verify
     decorate: true
     decoration_config:
@@ -808,7 +808,7 @@ presubmits:
     labels:
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-priv-router-master-verify
+    name: pull-ci-openshift-priv-router-main-verify
     path_alias: github.com/openshift/router
     rerun_command: /test verify
     spec:
diff --git a/ci-operator/jobs/openshift/router/openshift-router-master-postsubmits.yaml b/ci-operator/jobs/openshift/router/openshift-router-main-postsubmits.yaml
similarity index 95%
rename from ci-operator/jobs/openshift/router/openshift-router-master-postsubmits.yaml
rename to ci-operator/jobs/openshift/router/openshift-router-main-postsubmits.yaml
index 592dbccc83873..7ea1b476ff1ce 100644
--- a/ci-operator/jobs/openshift/router/openshift-router-master-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/router/openshift-router-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-router-master-images
+    name: branch-ci-openshift-router-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-router-master-okd-scos-images
+    name: branch-ci-openshift-router-main-okd-scos-images
     spec:
       containers:
       - args:
diff --git a/ci-operator/jobs/openshift/router/openshift-router-master-presubmits.yaml b/ci-operator/jobs/openshift/router/openshift-router-main-presubmits.yaml
similarity index 94%
rename from ci-operator/jobs/openshift/router/openshift-router-master-presubmits.yaml
rename to ci-operator/jobs/openshift/router/openshift-router-main-presubmits.yaml
index 872f7dc88455c..2edd92c77e1fe 100644
--- a/ci-operator/jobs/openshift/router/openshift-router-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/router/openshift-router-main-presubmits.yaml
@@ -3,8 +3,8 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build02
     context: ci/prow/e2e-agnostic
     decorate: true
@@ -13,7 +13,7 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: gcp-3
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-router-master-e2e-agnostic
+    name: pull-ci-openshift-router-main-e2e-agnostic
     rerun_command: /test e2e-agnostic
     spec:
       containers:
@@ -75,9 +75,9 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build07
+    - ^main$
+    - ^main-
+    cluster: build05
     context: ci/prow/e2e-aws-serial
     decorate: true
     labels:
@@ -85,7 +85,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-router-master-e2e-aws-serial
+    name: pull-ci-openshift-router-main-e2e-aws-serial
     rerun_command: /test e2e-aws-serial
     spec:
       containers:
@@ -145,10 +145,10 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build05
     context: ci/prow/e2e-metal-ipi-ovn-dualstack
     decorate: true
@@ -158,7 +158,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-router-master-e2e-metal-ipi-ovn-dualstack
+    name: pull-ci-openshift-router-main-e2e-metal-ipi-ovn-dualstack
     optional: true
     rerun_command: /test e2e-metal-ipi-ovn-dualstack
     spec:
@@ -221,8 +221,8 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build05
     context: ci/prow/e2e-metal-ipi-ovn-ipv6
     decorate: true
@@ -232,7 +232,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-router-master-e2e-metal-ipi-ovn-ipv6
+    name: pull-ci-openshift-router-main-e2e-metal-ipi-ovn-ipv6
     optional: true
     rerun_command: /test e2e-metal-ipi-ovn-ipv6
     spec:
@@ -293,10 +293,10 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
-    - ^master$
-    - ^master-
+    - ^main$
+    - ^main-
     cluster: build05
     context: ci/prow/e2e-metal-ipi-ovn-router
     decorate: true
@@ -306,7 +306,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-router-master-e2e-metal-ipi-ovn-router
+    name: pull-ci-openshift-router-main-e2e-metal-ipi-ovn-router
     optional: true
     rerun_command: /test e2e-metal-ipi-ovn-router
     spec:
@@ -369,9 +369,9 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build06
+    - ^main$
+    - ^main-
+    cluster: build03
     context: ci/prow/e2e-upgrade
     decorate: true
     labels:
@@ -379,7 +379,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-router-master-e2e-upgrade
+    name: pull-ci-openshift-router-main-e2e-upgrade
     rerun_command: /test e2e-upgrade
     spec:
       containers:
@@ -441,15 +441,15 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build06
+    - ^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-router-master-images
+    name: pull-ci-openshift-router-main-images
     rerun_command: /test images
     spec:
       containers:
@@ -495,9 +495,9 @@ presubmits:
   - agent: kubernetes
     always_run: false
     branches:
-    - ^master$
-    - ^master-
-    cluster: build07
+    - ^main$
+    - ^main-
+    cluster: build05
     context: ci/prow/okd-scos-e2e-aws-ovn
     decorate: true
     decoration_config:
@@ -508,7 +508,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-router-master-okd-scos-e2e-aws-ovn
+    name: pull-ci-openshift-router-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)$
@@ -571,11 +571,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: build06
+    - ^main$
+    - ^main-
+    cluster: build03
     context: ci/prow/okd-scos-images
     decorate: true
     decoration_config:
@@ -584,8 +584,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-router-master-okd-scos-images
-    optional: true
+    name: pull-ci-openshift-router-main-okd-scos-images
     rerun_command: /test okd-scos-images
     spec:
       containers:
@@ -632,9 +631,9 @@ presubmits:
   - agent: kubernetes
     always_run: false
     branches:
-    - ^master$
-    - ^master-
-    cluster: build07
+    - ^main$
+    - ^main-
+    cluster: build05
     context: ci/prow/perfscale-aws-fips-ingress-perf
     decorate: true
     decoration_config:
@@ -644,7 +643,7 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-router-master-perfscale-aws-fips-ingress-perf
+    name: pull-ci-openshift-router-main-perfscale-aws-fips-ingress-perf
     optional: true
     rerun_command: /test perfscale-aws-fips-ingress-perf
     spec:
@@ -707,9 +706,9 @@ presubmits:
   - agent: kubernetes
     always_run: false
     branches:
-    - ^master$
-    - ^master-
-    cluster: build07
+    - ^main$
+    - ^main-
+    cluster: build05
     context: ci/prow/perfscale-aws-ingress-perf
     decorate: true
     decoration_config:
@@ -719,7 +718,7 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-perfscale
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-router-master-perfscale-aws-ingress-perf
+    name: pull-ci-openshift-router-main-perfscale-aws-ingress-perf
     optional: true
     rerun_command: /test perfscale-aws-ingress-perf
     spec:
@@ -782,15 +781,15 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build06
+    - ^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-router-master-unit
+    name: pull-ci-openshift-router-main-unit
     rerun_command: /test unit
     spec:
       containers:
@@ -835,15 +834,15 @@ presubmits:
   - agent: kubernetes
     always_run: true
     branches:
-    - ^master$
-    - ^master-
-    cluster: build06
+    - ^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-router-master-verify
+    name: pull-ci-openshift-router-main-verify
     rerun_command: /test verify
     spec:
       containers:


Reviews:
user: login: Miciah
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-03-18T15:43:18Z
user: login: DennisPeriquet
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-03-18T17:57:30Z

Review comments:
diff_hunk: @@ -107,7 +107,7 @@ tests:
         echo "************ baremetalds e2e router conf command ************"
 
         read -d '#' INCL << EOF
-        [sig-network] Services should provide secure master service
+        [sig-network] Services should provide secure main service
path: ci-operator/config/openshift-priv/router/openshift-priv-router-main.yaml
user: login: Miciah
body: This looks like a mistake.  
created_at: 2025-03-18T15:43:18Z
author_association: CONTRIBUTOR
diff_hunk: @@ -107,7 +107,7 @@ tests:
         echo "************ baremetalds e2e router conf command ************"
 
         read -d '#' INCL << EOF
-        [sig-network] Services should provide secure master service
+        [sig-network] Services should provide secure main service
path: ci-operator/config/openshift-priv/router/openshift-priv-router-main.yaml
user: login: DennisPeriquet
body: Good catch and thank you @Miciah

The change is pushed.
created_at: 2025-03-18T17:57:30Z
author_association: CONTRIBUTOR

PR comments:
user: login: openshift-ci-robot
created_at: 2025-03-17T15:18:59Z
body: @DennisPeriquet: This pull request references [Jira Issue OCPBUGS-53195](https://issues.redhat.com//browse/OCPBUGS-53195), which is valid. The bug has been moved to the POST state.

<details><summary>3 validation(s) were run on this bug</summary>

* bug is open, matching expected state (open)
* bug target version (4.19.0) matches configured target version for branch (4.19.0)
* bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)</details>

Requesting review from QA contact:
/cc @lihongan

The bug has been updated to refer to the pull request using the external bug tracker.

<details>

In response to [this](https://github.com/openshift/release/pull/62904):

>
>This PR is in support of renaming the default branch for https://github.com/openshift/router from 'master' to 'main'.
>
>Unhold this PR only when:
>
>* the default branch for https://github.com/openshift/router has been renamed to 'main'
>* You have verified that the CI jobs are working as expected either by running '/pj-rehearse' or by inspection.
>
>/hold
>


Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Frelease).  If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
</details>
author_association: CONTRIBUTOR
user: login: openshift-ci-robot
created_at: 2025-03-18T18:00:32Z
body: [REHEARSALNOTIFIER] 
@DennisPeriquet: the `pj-rehearse` plugin accommodates running rehearsal tests for the changes in this PR. Expand **'Interacting with pj-rehearse'** for usage details. The following rehearsable tests have been affected by this change:

Test name | Repo | Type | Reason
--- | --- | --- | ---
pull-ci-openshift-router-main-e2e-agnostic | openshift/router | presubmit | Presubmit changed
pull-ci-openshift-router-main-e2e-aws-serial | openshift/router | presubmit | Presubmit changed
pull-ci-openshift-router-main-e2e-metal-ipi-ovn-dualstack | openshift/router | presubmit | Presubmit changed
pull-ci-openshift-router-main-e2e-metal-ipi-ovn-ipv6 | openshift/router | presubmit | Presubmit changed
pull-ci-openshift-router-main-e2e-metal-ipi-ovn-router | openshift/router | presubmit | Presubmit changed
pull-ci-openshift-router-main-e2e-upgrade | openshift/router | presubmit | Presubmit changed
pull-ci-openshift-router-main-images | openshift/router | presubmit | Presubmit changed
pull-ci-openshift-router-main-okd-scos-e2e-aws-ovn | openshift/router | presubmit | Presubmit changed
pull-ci-openshift-router-main-okd-scos-images | openshift/router | presubmit | Presubmit changed
pull-ci-openshift-router-main-perfscale-aws-fips-ingress-perf | openshift/router | presubmit | Presubmit changed
pull-ci-openshift-router-main-perfscale-aws-ingress-perf | openshift/router | presubmit | Presubmit changed
pull-ci-openshift-router-main-unit | openshift/router | presubmit | Presubmit changed
pull-ci-openshift-router-main-verify | openshift/router | presubmit | Presubmit changed

<details>
<summary>Interacting with pj-rehearse</summary>

Comment: `/pj-rehearse` to run up to 5 rehearsals
Comment: `/pj-rehearse skip` to opt-out of rehearsals
Comment: `/pj-rehearse {test-name}`, with each test separated by a space, to run one or more specific rehearsals
Comment: `/pj-rehearse more` to run up to 10 rehearsals
Comment: `/pj-rehearse max` to run up to 25 rehearsals
Comment: `/pj-rehearse auto-ack` to run up to 5 rehearsals, and add the `rehearsals-ack` label on success
Comment: `/pj-rehearse list` to get an up-to-date list of affected jobs
Comment: `/pj-rehearse abort` to abort all active rehearsals
Comment: `/pj-rehearse network-access-allowed` to allow rehearsals of tests that have the `restrict_network_access` field set to `false`. This must be executed by an `openshift` org member who is **not** the PR author

Once you are satisfied with the results of the rehearsals, comment: `/pj-rehearse ack` to unblock merge. When the `rehearsals-ack` label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the `rehearsals-ack` label removed, comment: `/pj-rehearse reject` to re-block merging.
</details>
author_association: CONTRIBUTOR
user: login: ShudiLi
created_at: 2025-03-19T02:36:24Z
body: /jira refresh
author_association: CONTRIBUTOR
user: login: openshift-ci-robot
created_at: 2025-03-19T02:36:29Z
body: @ShudiLi: This pull request references [Jira Issue OCPBUGS-53195](https://issues.redhat.com//browse/OCPBUGS-53195), which is valid.

<details><summary>3 validation(s) were run on this bug</summary>

* bug is open, matching expected state (open)
* bug target version (4.19.0) matches configured target version for branch (4.19.0)
* bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)</details>

Requesting review from QA contact:
/cc @ShudiLi

<details>

In response to [this](https://github.com/openshift/release/pull/62904#issuecomment-2735175578):

>/jira refresh


Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Frelease).  If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
</details>
author_association: CONTRIBUTOR
user: login: ShudiLi
created_at: 2025-03-19T02:37:03Z
body: /lgtm
thanks
author_association: CONTRIBUTOR
user: login: DennisPeriquet
created_at: 2025-03-19T14:32:20Z
body: if you're ready for the rename, I will need an approval.

You can go down one of these paths:

* seek approval from someone in the APPROVERS list
* just let me know and one of my team members can approve for you

author_association: CONTRIBUTOR
user: login: ShudiLi
created_at: 2025-03-20T01:06:39Z
body: /label qe-approved
author_association: CONTRIBUTOR
user: login: jupierce
created_at: 2025-03-20T18:45:19Z
body: /approve
author_association: CONTRIBUTOR
user: login: openshift-ci[bot]
created_at: 2025-03-20T18:46:16Z
body: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/openshift/release/pull/62904#" title="Author self-approved">DennisPeriquet</a>*, *<a href="https://github.com/openshift/release/pull/62904#issuecomment-2741370865" title="Approved">jupierce</a>*, *<a href="https://github.com/openshift/release/pull/62904#issuecomment-2735176304" title="LGTM">ShudiLi</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=openshift%2Frelease).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[ci-operator/config/openshift/router/OWNERS](https://github.com/openshift/release/blob/master/ci-operator/config/openshift/router/OWNERS)~~ [jupierce]
- ~~[ci-operator/jobs/openshift-priv/router/OWNERS](https://github.com/openshift/release/blob/master/ci-operator/jobs/openshift-priv/router/OWNERS)~~ [jupierce]
- ~~[ci-operator/jobs/openshift/router/OWNERS](https://github.com/openshift/release/blob/master/ci-operator/jobs/openshift/router/OWNERS)~~ [jupierce]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
author_association: CONTRIBUTOR
user: login: DennisPeriquet
created_at: 2025-03-20T18:47:19Z
body: /pj-rehearse pull-ci-openshift-router-main-images
author_association: CONTRIBUTOR
user: login: openshift-ci-robot
created_at: 2025-03-20T18:47:21Z
body: @DennisPeriquet: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.
author_association: CONTRIBUTOR
user: login: DennisPeriquet
created_at: 2025-03-20T19:49:31Z
body: /pj-rehearse ack
/hold cancel
author_association: CONTRIBUTOR
user: login: openshift-ci-robot
created_at: 2025-03-20T19:49:33Z
body: @DennisPeriquet: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.
author_association: CONTRIBUTOR
user: login: openshift-ci-robot
created_at: 2025-03-20T20:25:51Z
body: @DennisPeriquet: [Jira Issue OCPBUGS-53195](https://issues.redhat.com//browse/OCPBUGS-53195): All pull requests linked via external trackers have merged:
 * [openshift/release#62904](https://github.com/openshift/release/pull/62904)

[Jira Issue OCPBUGS-53195](https://issues.redhat.com//browse/OCPBUGS-53195) has been moved to the MODIFIED state.

<details>

In response to [this](https://github.com/openshift/release/pull/62904):

>
>This PR is in support of renaming the default branch for https://github.com/openshift/router from 'master' to 'main'.
>
>Unhold this PR only when:
>
>* the default branch for https://github.com/openshift/router has been renamed to 'main'
>* You have verified that the CI jobs are working as expected either by running '/pj-rehearse' or by inspection.
>
>/hold
>


Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Frelease).  If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
</details>
author_association: CONTRIBUTOR