NO-JIRA: Revert OCPBUGS-53003: Remove references to master branch

[stephenfin]

This reverts commit a7cb24b. openshift/release still uses master as the branch name. Absence of this logic prevent rehearsals.

[openshift-ci-robot]

@stephenfin: This pull request explicitly references no jira issue.

Details

In response to this:

This reverts commit a7cb24b. openshift/release still uses master as the branch name. Absence of this logic prevent rehearsals.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign racheljpg for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[coderabbitai]

Walkthrough

The pull request modifies openshift/e2e-tests.sh to conditionally assign CCAPIO_BASE_REF based on PULL_BASE_REF. When PULL_BASE_REF is "master", it sets CCAPIO_BASE_REF to "main"; otherwise, it propagates the value directly. This aligns the master branch reference to main for the upstream cluster-capi-operator dependency.

Changes

Cohort / File(s)	Summary
Conditional branch reference mapping openshift/e2e-tests.sh	Added if-fi conditional block to map PULL_BASE_REF to CCAPIO_BASE_REF: sets to "main" when PULL_BASE_REF is "master", otherwise propagates the value unchanged.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

• Verify the conditional logic correctly maps "master" to "main" and other branches pass through unchanged
• Confirm the shell syntax (if-fi block) is properly formatted
• Ensure the change aligns with the intended upstream dependency versioning strategy

✨ Finishing touches

• 📝 Generate docstrings

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment

---

📜 Recent review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Cache: Disabled due to data retention organization setting

Knowledge base: Disabled due to Reviews -> Disable Knowledge Base setting

📥 Commits

Reviewing files that changed from the base of the PR and between 47bf1f7 and 5ef6e2e.

📒 Files selected for processing (1)

• openshift/e2e-tests.sh (1 hunks)

🧰 Additional context used

📓 Path-based instructions (1)

**

⚙️ CodeRabbit configuration file

-Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity.

Files:

• openshift/e2e-tests.sh

🔇 Additional comments (1)

openshift/e2e-tests.sh (1)

10-15: LGTM!

The conditional mapping correctly addresses the revert requirement: when PULL_BASE_REF is "master", it maps to "main" (cluster-capi-operator's default branch), and otherwise propagates the base ref unchanged. This restores compatibility with openshift/release's use of "master" and fixes the rehearsal regression described in the PR.

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[stephenfin]

/assign @nrb

[openshift-ci]

@stephenfin: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-ovn	5ef6e2e	link	true	/test e2e-aws-ovn

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

[damdo]

Stephen could we add an or and also add main to this here now. The default branch for this one has changed it seems. TY