labels: remove duplicate ViaQ/vector tide/merge-method-squash label#79264
labels: remove duplicate ViaQ/vector tide/merge-method-squash label#79264redhat-chai-bot wants to merge 1 commit into
Conversation
WalkthroughThis pull request adds a single repo-specific label configuration to Prow's label definitions. The new ChangesProw Label Configuration
🎯 1 (Trivial) | ⏱️ ~2 minutes 🚥 Pre-merge checks | ✅ 11 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (11 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
⚔️ Resolve merge conflicts
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
@redhat-chai-bot, Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
Hi @redhat-chai-bot. Thanks for your PR. I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with Tip We noticed you've done this a few times! Consider joining the org to skip this step and gain Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions 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. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: redhat-chai-bot The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@core-services/prow/02_config/_labels.yaml`:
- Around line 1286-1292: The PR description and the actual change are
inconsistent: the diff adds a new label "allow-automatic-merge" under
rh-ecosystem-edge/recert (labels block with name allow-automatic-merge) but the
objective claims removing a duplicate tide/merge-method-squash label for
ViaQ/vector; clarify intent and make the code match it—either update this patch
to remove the duplicate tide/merge-method-squash entry under the ViaQ/vector
repository (search for repository key "ViaQ/vector" and label name
"tide/merge-method-squash" and remove the duplicate), or change the PR
description to state that you are adding the allow-automatic-merge label for
rh-ecosystem-edge/recert (keep the labels block as-is) and ensure no other files
need simultaneous edits; also verify periodic-label-sync validation locally
after making the aligned change.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 5dc3ed6a-59b0-4a97-ba7f-0090e909e29d
📒 Files selected for processing (1)
core-services/prow/02_config/_labels.yaml
| rh-ecosystem-edge/recert: | ||
| labels: | ||
| - color: 0ffa16 | ||
| description: Allows Tide to automatically merge PRs from trusted authors | ||
| name: allow-automatic-merge | ||
| target: prs | ||
| addedBy: label |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
# Description: Check if ViaQ/vector tide/merge-method-squash exists in the current file
# Search for ViaQ/vector repo configuration
echo "=== Searching for ViaQ/vector configuration ==="
rg -n -A 20 'ViaQ/vector:' core-services/prow/02_config/_labels.yaml
# Search for any tide/merge-method-squash under repos section
echo -e "\n=== Searching for repo-specific tide/merge-method-squash labels ==="
rg -n -B 5 'tide/merge-method-squash' core-services/prow/02_config/_labels.yaml | rg -A 5 'repos:'Repository: openshift/release
Length of output: 178
PR objectives do not match actual code changes; critical inconsistency requires clarification.
The PR objectives describe removing a duplicate tide/merge-method-squash label for ViaQ/vector to fix failing periodic-label-sync validation errors. The actual code changes shown (lines 1286-1292) add a new allow-automatic-merge label configuration for rh-ecosystem-edge/recert.
Verification confirms no ViaQ/vector repository configuration or tide/merge-method-squash labels exist in the file. If the PR intends to address the label-sync failure mentioned in the objectives, these visible changes do not accomplish that. The PR description and actual code changes appear misaligned—either the objectives are incorrect, the changes are incomplete, or this may be the wrong file or branch.
Please clarify which change this PR is intended to make.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@core-services/prow/02_config/_labels.yaml` around lines 1286 - 1292, The PR
description and the actual change are inconsistent: the diff adds a new label
"allow-automatic-merge" under rh-ecosystem-edge/recert (labels block with name
allow-automatic-merge) but the objective claims removing a duplicate
tide/merge-method-squash label for ViaQ/vector; clarify intent and make the code
match it—either update this patch to remove the duplicate
tide/merge-method-squash entry under the ViaQ/vector repository (search for
repository key "ViaQ/vector" and label name "tide/merge-method-squash" and
remove the duplicate), or change the PR description to state that you are adding
the allow-automatic-merge label for rh-ecosystem-edge/recert (keep the labels
block as-is) and ensure no other files need simultaneous edits; also verify
periodic-label-sync validation locally after making the aligned change.
PR openshift#78874 added a repo-specific tide/merge-method-squash label for ViaQ/vector, but this label is already defined in the default section and applied to all repos. The duplicate causes the periodic-label-sync job to fail with: invalid config: duplicate label tide/merge-method-squash at ViaQ/vector.tide/merge-method-squash and default.tide/merge-method-squash The label-sync job has been failing every week since Jan 21, 2026, preventing label syncing for all configured orgs. Removing the repo-specific entry fixes the validation error. The tide/merge-method-squash label will continue to be available on ViaQ/vector via the default configuration.
a2ca4d0 to
630b817
Compare
|
Thanks @coderabbitai — you were right. The original branch was based on a stale shallow clone, so the diff was incorrect (it showed an unrelated addition instead of the ViaQ/vector removal). I've force-pushed a corrected commit based on the current /pj-rehearse skip |
|
@redhat-chai-bot: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
@redhat-chai-bot: needs-ok-to-test label found, no rehearsals will be run |
|
[REHEARSALNOTIFIER] Note: If this PR includes changes to step registry files ( Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
Closing in favor of a proper |
|
I'll re-review the updated diff now. ✅ Actions performedReview triggered.
|
Problem
PR #78874 added a repo-specific
tide/merge-method-squashlabel forViaQ/vectorin therepos:section of_labels.yaml. However, this label is already defined in thedefault:section and applies to all repos globally.The label-sync tool validates that no label name appears in both
defaultand a repo-specific section. This duplicate causes the config validation to fail with:The
periodic-label-syncjob has been failing every week since January 21, 2026, preventing label syncing for ALL configured orgs (openshift, openshift-eng, openshift-priv, cri-o, operator-framework, etc.).Fix
Remove the redundant
ViaQ/vectorrepo-specific entry. Thetide/merge-method-squashlabel will continue to be available onViaQ/vector(and all other repos) via thedefaultconfiguration — so the original intent of PR #78874 is fully preserved.Impact
Once merged, the postsubmit
branch-ci-openshift-release-main-label-syncjob will automatically run and restore label syncing for all configured orgs./cc @jcantrill
Summary
This PR fixes a validation error in the Prow label configuration by removing a duplicate label definition.
Problem
PR #78874 had added a repo-specific
tide/merge-method-squashlabel for the ViaQ/vector repository in therepos:section of_labels.yaml. However, this same label already exists in thedefault:section, which applies globally to all repositories. The label-sync tool rejects configurations where the same label appears in both sections, causing this validation error:As a result, the
periodic-label-syncjob has been failing weekly since January 21, 2026, preventing label syncing for all configured organizations.Solution
The PR removes the redundant ViaQ/vector-specific entry for
tide/merge-method-squash. The label remains available for ViaQ/vector (and all other repositories) through the global default configuration.Impact
periodic-label-syncjob will resume functioning, allowing label synchronization across all configured organizationstide/merge-method-squashlabel continues to apply via the default configuration