Skip to content

Revert "update ViaQ/vector labels to allow squash merge (#78874)"#79266

Open
redhat-chai-bot wants to merge 1 commit into
openshift:mainfrom
redhat-chai-bot:chai-bot/revert-78874
Open

Revert "update ViaQ/vector labels to allow squash merge (#78874)"#79266
redhat-chai-bot wants to merge 1 commit into
openshift:mainfrom
redhat-chai-bot:chai-bot/revert-78874

Conversation

@redhat-chai-bot
Copy link
Copy Markdown
Contributor

@redhat-chai-bot redhat-chai-bot commented May 13, 2026

This reverts commit f9c07a7.

Why

PR #78874 added a repo-specific tide/merge-method-squash label for ViaQ/vector in the repos: section of _labels.yaml. This label is already defined in the default: section (which applies to all repos), causing a duplicate that the label-sync tool rejects during config validation:

invalid config: duplicate label tide/merge-method-squash at ViaQ/vector.tide/merge-method-squash and default.tide/merge-method-squash

The periodic-label-sync job has been failing every week since January 21, 2026, preventing label syncing for ALL configured orgs (openshift, openshift-eng, openshift-priv, etc.).

What this does

Reverts the addition of the ViaQ/vector repo-specific entry. The tide/merge-method-squash label remains available on ViaQ/vector (and all other repos) via the default configuration — the original intent of PR #78874 is fully preserved.

Replaces #79264 (which was a manual edit rather than a proper revert).

/cc @jcantrill

Revert of duplicate label configuration for ViaQ/vector

This PR reverts a change from PR #78874 that added a repository-specific tide/merge-method-squash label configuration for the ViaQ/vector repository. The label already exists in the default configuration section, creating a duplicate-label validation error that caused the label-sync tool to reject the entire configuration.

Impact on CI infrastructure:

  • Fixes failing periodic sync job: The weekly periodic-label-sync job has been failing since January 21, 2026, due to the duplicate label validation error. This revert restores the job's ability to sync Prow labels across all configured organizations.
  • Preserves label availability: The tide/merge-method-squash label remains available for ViaQ/vector through the default configuration, maintaining the original intent of enabling squash merge behavior for this repository.

Changes:

  • Removes the ViaQ/vector repository-specific label configuration block (7 lines) from core-services/prow/02_config/_labels.yaml

@openshift-ci openshift-ci Bot requested a review from jcantrill May 13, 2026 18:31
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 13, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: af424d03-d747-42fd-a770-86e67b048454

📥 Commits

Reviewing files that changed from the base of the PR and between 910a89c and bbdf630.

📒 Files selected for processing (1)
  • core-services/prow/02_config/_labels.yaml
💤 Files with no reviewable changes (1)
  • core-services/prow/02_config/_labels.yaml

Walkthrough

The PR removes the repository-specific label configuration for ViaQ/vector from Prow's labels configuration file, eliminating the tide/merge-method-squash label definition (7 lines).

Changes

Prow Repository Label Removal

Layer / File(s) Summary
ViaQ/vector repository label configuration removal
core-services/prow/02_config/_labels.yaml
The entire repos.ViaQ/vector block including the tide/merge-method-squash label entry is deleted from the YAML configuration.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and accurately describes the main change: reverting a previous commit that added ViaQ/vector labels, which is the precise action taken in the changeset.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed Check not applicable. This PR only modifies a YAML configuration file and contains no Ginkgo test code. The custom check for stable Ginkgo test names does not apply.
Test Structure And Quality ✅ Passed PR only modifies a YAML config file (core-services/prow/02_config/_labels.yaml), not Ginkgo test code. The custom check for test structure and quality is not applicable.
Microshift Test Compatibility ✅ Passed This PR only modifies a Prow labels configuration file, reverting a change to remove a ViaQ/vector repo label. No new Ginkgo e2e tests are added, so the check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR reverts a prow label config change in _labels.yaml. It contains no Ginkgo e2e tests. SNO compatibility check applies only to new e2e tests, so not applicable here.
Topology-Aware Scheduling Compatibility ✅ Passed PR reverts a Prow CI label configuration file. The topology-aware scheduling check only applies to deployment manifests, operator code, or controllers. Not applicable.
Ote Binary Stdout Contract ✅ Passed This PR modifies only a YAML configuration file for Prow label management. The OTE Binary Stdout Contract check applies to executable code, not configuration files.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No Ginkgo e2e tests added. PR only modifies core-services/prow/02_config/_labels.yaml, a Prow configuration file that defines repository labels. Check is not applicable to configuration files.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

  • Generate code and open pull requests
  • Plan features and break down work
  • Investigate incidents and troubleshoot customer tickets together
  • Automate recurring tasks and respond to alerts with triggers
  • Summarize progress and report instantly

Built for teams:

  • Shared memory across your entire org—no repeating context
  • Per-thread sandboxes to safely plan and execute work
  • Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started


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.

❤️ Share

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

@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 13, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 13, 2026

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 /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Tip

We noticed you've done this a few times! Consider joining the org to skip this step and gain /lgtm and other bot rights. We recommend asking approvers on your previous PRs to sponsor you.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 13, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@redhat-chai-bot: no rehearsable tests are affected by this change

Note: If this PR includes changes to step registry files (ci-operator/step-registry/) and you expected jobs to be found, try rebasing your PR onto the base branch. This helps pj-rehearse accurately detect changes when the base branch has moved forward.

@brandisher
Copy link
Copy Markdown
Contributor

/ok-to-test

@openshift-ci openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 13, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 13, 2026

@redhat-chai-bot: all tests passed!

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.

@brandisher
Copy link
Copy Markdown
Contributor

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 13, 2026

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@jcantrill
Copy link
Copy Markdown
Contributor

/approved
/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 14, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 14, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jcantrill, redhat-chai-bot
Once this PR has been reviewed and has the lgtm label, please assign wking 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:

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

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

Labels

lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants