Skip to content

Update openshift/release branch references from master to main#4931

Open
deepsm007 wants to merge 1 commit intoopenshift:mainfrom
deepsm007:branch-rename
Open

Update openshift/release branch references from master to main#4931
deepsm007 wants to merge 1 commit intoopenshift:mainfrom
deepsm007:branch-rename

Conversation

@deepsm007
Copy link
Contributor

/cc @hector-vido @openshift/test-platform

@openshift-ci-robot
Copy link
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: automatic mode

@openshift-ci openshift-ci bot requested review from a team and hector-vido February 9, 2026 18:06
@hector-vido
Copy link
Contributor

/lgtm

@coderabbitai
Copy link

coderabbitai bot commented Feb 9, 2026

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review

Walkthrough

Branch references and related URLs were changed from "master" to "main" across documentation, tests, and a few source files; one generator now sorts URL lists for deterministic job name generation.

Changes

Cohort / File(s) Summary
README / docs
cmd/autoowners/README.md, cmd/ci-images-mirror/README.md, cmd/cvp-trigger/README.md, cmd/github-ldap-user-group-creator/README.md, cmd/gsm-secret-sync/README.md, cmd/payload-testing-ui/README.md, cmd/promoted-image-governor/README.md, cmd/prow-job-dispatcher/README.md, cmd/sync-rover-groups/README.md, cmd/testgrid-config-generator/README.md
Updated links and branch references from master to main in documentation and deployment/CI references.
Cmd sources & templates
cmd/ci-operator-yaml-creator/main.go, cmd/promoted-image-governor/main.go, cmd/payload-testing-ui/server.go
Updated PR/body/template URLs and docs to reference main instead of master.
Production code (branch/url usage)
pkg/controller/quay_io_ci_images_distributor/quay_io_ci_images_distributor.go, pkg/slack/events/joblink/link.go, pkg/webreg/webreg.go
Switched config-fetching and generated URL paths to main (error messages/links updated accordingly).
Deterministic job-name generation
pkg/jobrunaggregator/jobtableprimer/job_name_generator.go
Added sorting of periodic and release URL lists to ensure deterministic ordering; also updated template URLs from master to main.
Tests & fixtures (many)
cmd/multi-pr-prow-plugin/server_test.go, cmd/payload-testing-prow-plugin/server_test.go, cmd/payload-testing-ui/server.go (tests), pkg/controller/prpqr_reconciler/prpqr_reconciler_test.go, pkg/defaults/defaults_test.go, pkg/prowgen/jobbase_test.go, pkg/prowgen/testdata/...zz_fixture_*.yaml, pkg/controller/prpqr_reconciler/testdata/...yaml
Replaced master with main in test data, expected values, fixture names, and generated job names to match branch rename.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Tip

Issue Planner is now in beta. Read the docs and try it out! Share your feedback on Discord.


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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 9, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deepsm007, hector-vido

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [deepsm007,hector-vido]

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 9, 2026
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 9, 2026
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
cmd/promoted-image-governor/README.md (1)

41-45: ⚠️ Potential issue | 🟡 Minor

Update the remaining master link to main.
Line 44 still points to /blob/master, which is inconsistent with the branch rename and likely stale.

Proposed fix
-The pre-submit job [pull-ci-openshift-release-openshift-image-mirror-mappings](https://prow.ci.openshift.org/?job=pull-ci-openshift-release-openshift-image-mirror-mappings) ([definition](https://github.com/openshift/release/blob/master/ci-operator/jobs/openshift/release/openshift-release-master-presubmits.yaml))
+The pre-submit job [pull-ci-openshift-release-openshift-image-mirror-mappings](https://prow.ci.openshift.org/?job=pull-ci-openshift-release-openshift-image-mirror-mappings) ([definition](https://github.com/openshift/release/blob/main/ci-operator/jobs/openshift/release/openshift-release-master-presubmits.yaml))

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 9, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 9, 2026

New changes are detected. LGTM label has been removed.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Fix all issues with AI agents
In `@pkg/controller/prpqr_reconciler/prpqr_reconciler_test.go`:
- Around line 90-92: The test's sentinel "missing" job name no longer matches
the job Branch set to "main" in the v1.ReleaseJobSpec
(CIOperatorMetadata.Branch), so the fake dispatcher will not exercise the "not
found" path; update the sentinel name in the fake dispatcher to use "main"
(e.g., change periodic-ci-openshift-release-master-missing to
periodic-ci-openshift-release-main-missing) or, better, derive the sentinel job
name from the test's Jobs[...].CIOperatorMetadata (Org/Repo/Branch) so the fake
dispatcher and the test spec stay in sync; update the code in the fake
dispatcher setup where the sentinel/missing job name is registered to use the
Branch from the test spec.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
cmd/multi-pr-prow-plugin/server_test.go (1)

329-338: ⚠️ Potential issue | 🟡 Minor

Inconsistent branch reference for openshift/release in test data.

The fake PR at line 335 uses Ref: "master" for openshift/release#876, but the config resolver at line 339 has an entry with Branch: "main" for the same repository. This inconsistency suggests an incomplete rename and could cause confusion in test maintenance. Update line 335 to also use "main" for consistency with the config setup.

Proposed fix
 				"openshift/release#876": {
 					Base: github.PullRequestBranch{
 						Repo: github.Repo{
 							Owner: github.User{Login: "openshift"},
 							Name:  "release",
 						},
-						Ref: "master",
+						Ref: "main",
 					},
 					Number: 876,
 				},
🧹 Nitpick comments (1)
cmd/testgrid-config-generator/README.md (1)

57-57: LGTM! Branch reference correctly updated.

The URL successfully points to the main branch, aligning with the repository-wide branch rename.

Optional cleanup: The static analysis tool correctly flags that this reference definition [release-controller-config] is unused in the document. Line 3 references [release-controller] (defined on line 58) instead. Consider either using this reference or removing the definition for cleaner documentation.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
cmd/multi-pr-prow-plugin/server_test.go (1)

399-652: ⚠️ Potential issue | 🟠 Major

Update expected Branch values from master to main throughout test cases.

The jobMetadataFromRawCommand function extracts the branch directly from the command string at position 2 (line 307-319 of server.go). Since all test commands in TestDetermineJobRuns use main (e.g., /testwith openshift/ci-tools/main/unit), the expected JobMetadata.Branch values should be main, not master. Update all affected test cases accordingly.

@deepsm007
Copy link
Contributor Author

/test e2e

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Fix all issues with AI agents
In `@cmd/promoted-image-governor/README.md`:
- Around line 32-33: The README contains a typo: replace the phrase "Genenerate
the mapping files" with "Generate the mapping files" so that the second bullet
reads correctly; update the README entry (the line containing "Genenerate the
mapping files") to fix the misspelling.

Comment on lines +32 to 33
- Read [the config file](https://github.com/openshift/release/blob/main/core-services/image-mirroring/openshift/_config.yaml) and [the release-controllers' config](https://github.com/openshift/release/tree/main/core-services/release-controller/_releases)
- Genenerate the mapping files
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Fix typo: “Genenerate” → “Generate”.
Small doc typo in the mapping files section.

✏️ Proposed fix
-- Genenerate the mapping files
+- Generate the mapping files
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- Read [the config file](https://github.com/openshift/release/blob/main/core-services/image-mirroring/openshift/_config.yaml) and [the release-controllers' config](https://github.com/openshift/release/tree/main/core-services/release-controller/_releases)
- Genenerate the mapping files
- Read [the config file](https://github.com/openshift/release/blob/main/core-services/image-mirroring/openshift/_config.yaml) and [the release-controllers' config](https://github.com/openshift/release/tree/main/core-services/release-controller/_releases)
- Generate the mapping files
🧰 Tools
🪛 LanguageTool

[grammar] ~32-~32: Ensure spelling is correct
Context: ...ml) and the release-controllers' config - Genenerate the mapping files ### Explain Looks f...

(QB_NEW_EN_ORTHOGRAPHY_ERROR_IDS_1)

🤖 Prompt for AI Agents
In `@cmd/promoted-image-governor/README.md` around lines 32 - 33, The README
contains a typo: replace the phrase "Genenerate the mapping files" with
"Generate the mapping files" so that the second bullet reads correctly; update
the README entry (the line containing "Genenerate the mapping files") to fix the
misspelling.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 10, 2026

@deepsm007: The following tests 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/breaking-changes 65e772c link false /test breaking-changes
ci/prow/unit 65e772c link true /test unit

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants