Skip to content

OSAC-3734: osac-project: remove Tide merge queries, keep Prow plugins - #83121

Merged
openshift-merge-bot[bot] merged 10 commits into
openshift:mainfrom
omer-vishlitzky:osac-strip-tide-to-jira-only
Aug 9, 2026
Merged

OSAC-3734: osac-project: remove Tide merge queries, keep Prow plugins#83121
openshift-merge-bot[bot] merged 10 commits into
openshift:mainfrom
omer-vishlitzky:osac-strip-tide-to-jira-only

Conversation

@omer-vishlitzky

@omer-vishlitzky omer-vishlitzky commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

Summary

Remove Tide merge queries for osac-project/osac and osac-project/osac-test-infra. Tide will no longer process these repos.

All Prow plugins are unchanged_pluginconfig.yaml is NOT modified. Plugins (lgtm, approve, jira, hold, wip, lifecycle, etc.) continue setting labels via OWNERS files.

Why

OSAC is migrating to GitHub merge queue for merge automation. Tide cannot retest PRs against latest main when using GitHub Actions checks — its staleness detection only works with native Prow jobs. With zero Prow presubmits configured, Tide's per-context staleness bookkeeping iterates an empty list and never executes. Its merge gate only checks whether a required GitHub Actions check is currently reporting success, with no concept of "was this success computed against an old base SHA." This is confirmed upstream behavior (prow#356, test-infra#20713, test-infra#30628).

What changes

File Before After
osac/_prowconfig.yaml Tide query requiring lgtm + approved + jira/valid-reference {} (empty — Tide ignores repo)
osac-test-infra/_prowconfig.yaml Tide query requiring lgtm + approved + jira/valid-reference {} (empty — Tide ignores repo)
osac/_pluginconfig.yaml Prow plugins configured No change
osac-test-infra/_pluginconfig.yaml Prow plugins configured No change

What stays the same

  • /lgtm, /approve, /hold commands via Prow plugins
  • OWNERS-based review assignments
  • Jira validation (jira/valid-reference label)
  • All other Prow plugins (assign, blunderbuss, lifecycle, wip, etc.)

New merge flow

A label-gate GitHub Action (companion osac PR) reads Prow-set labels and converts them to a status check. GitHub merge queue gates on that check + E2E results.

Companion PRs

  1. OSAC-3734: add label-gate workflow for merge queue osac-project/osac#204 — add label-gate.yml workflow
  2. OSAC-3734: enable merge queue for osac monorepo osac-project/github-config#180 — enable merge queue, require label-gate check
  3. This PR — remove Tide queries

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Removed Tide merge queries for osac-project/osac and osac-project/osac-test-infra.
  • GitHub native merge queue automation can manage merges for these repositories.
  • Prow plugin configurations remain unchanged.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 7, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@omer-vishlitzky: This pull request explicitly references no jira issue.

Details

In response to this:

Summary

Strip Tide queries for osac-project/osac and osac-project/osac-test-infra down to jira-only:

  • Remove approved, lgtm from required labels — native GitHub approval replaces these
  • Remove needs-rebase, backports/unvalidated-commits from missing labels — merge queue handles branch freshness
  • Keep jira/valid-reference as the sole required label
  • Keep do-not-merge/hold, do-not-merge/work-in-progress, do-not-merge/invalid-owners-file, jira/invalid-bug as blocking labels
  • No changes to _pluginconfig.yaml — all Prow plugins (jira, approve, lgtm, hold, etc.) continue running

Context

OSAC is migrating from Tide merge automation to GitHub's native merge queue. Tide's tide commit status is used as a required status check for merge queue entry — it reports success when jira/valid-reference is present and no blocking labels exist. Tide physically cannot merge (merge queue blocks direct merges to the branch), so it functions purely as a Jira validation gate.

All Prow plugins remain active. Labels like lgtm, approved, hold are still set by Prow — they're just no longer required by Tide's merge query. Native GitHub approval and merge queue replace them as merge gates.

Companion PR

Test plan

  • Tide status on osac PRs reflects only jira/valid-reference requirement
  • PRs with jira/valid-reference show tide status as passing
  • PRs without jira/valid-reference show tide status as pending/failing
  • Prow plugins (jira, hold, wip, etc.) continue setting labels normally

🤖 Generated with Claude Code

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 openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 7, 2026
@coderabbitai

coderabbitai Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

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: 9222a54a-0957-4a03-a4d3-338076b76c3d

📥 Commits

Reviewing files that changed from the base of the PR and between ec91098 and c7e1b2e.

📒 Files selected for processing (2)
  • core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml
  • core-services/prow/02_config/osac-project/osac/_prowconfig.yaml
💤 Files with no reviewable changes (2)
  • core-services/prow/02_config/osac-project/osac/_prowconfig.yaml
  • core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml

Walkthrough

The PR removes repository-specific Tide queries, required-label checks, and missing-label checks from the osac-project/osac-test-infra and osac-project/osac configurations.

Changes

Cohort / File(s) Summary
OSAC Tide configuration
core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml, core-services/prow/02_config/osac-project/osac/_prowconfig.yaml
Both repositories no longer define repository-specific Tide queries or label checks.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Suggested reviewers: adriengentil, jhernand

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly summarizes the removal of Tide merge queries while preserving Prow plugins, which matches the main changes.
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 The commit changes only one Prow YAML file by deleting Tide configuration; it adds or modifies no Ginkgo tests or test titles, so the check is not applicable.
Test Structure And Quality ✅ Passed The commit changes only a Tide YAML file; it adds no Ginkgo tests or It blocks, and plugin configurations remain unchanged.
Microshift Test Compatibility ✅ Passed The available diff only removes Prow configuration; it adds no Ginkgo tests, test files, or OpenShift API references requiring MicroShift compatibility review.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The commit only deletes a Prow YAML file; it adds no Ginkgo tests or test code, so SNO compatibility checks do not apply.
Topology-Aware Scheduling Compatibility ✅ Passed The aggregate diff only deletes two Prow _prowconfig.yaml files; it adds or modifies no deployment, operator, controller, or scheduling constraints.
Ote Binary Stdout Contract ✅ Passed The PR changes only a Prow YAML configuration file; it contains no OTE binary, Go entrypoint, suite setup, or stdout write to assess.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The PR only removes two Prow YAML Tide configurations; it adds no Ginkgo tests, IPv4 assumptions, or external connectivity requirements.
No-Weak-Crypto ✅ Passed The aggregate PR diff only deletes Tide YAML entries. No MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, custom crypto, or secret comparisons are present.
Container-Privileges ✅ Passed The PR only deletes two Tide YAML files; affected OSAC directories contain no privileged, host*, SYS_ADMIN, or allowPrivilegeEscalation settings.
No-Sensitive-Data-In-Logs ✅ Passed The commit only deletes a Tide configuration file. It adds no logging or sensitive-data output, and the changed lines contain no sensitive-data terms.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci
openshift-ci Bot requested review from adriengentil and jhernand August 7, 2026 18:22
@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Aug 7, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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/osac-project/osac-test-infra/_prowconfig.yaml`:
- Line 1: Restore the Tide query requiring jira/valid-reference and blocking
labels in
core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml. Do
not modify core-services/prow/02_config/osac-project/osac/_prowconfig.yaml,
which has no corresponding removed query.
🪄 Autofix

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: 53d42ce9-8664-4b8c-8161-e93fe0138ac5

📥 Commits

Reviewing files that changed from the base of the PR and between 0ae35da and 7c48009.

📒 Files selected for processing (2)
  • core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml
  • core-services/prow/02_config/osac-project/osac/_prowconfig.yaml

Comment thread core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml Outdated
@omer-vishlitzky omer-vishlitzky changed the title NO-ISSUE: osac-project: strip Tide queries to jira-only OSAC-3734: osac-project: remove Tide merge queries, keep Prow plugins Aug 7, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

@omer-vishlitzky: This pull request references OSAC-3734 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

Remove Tide merge queries for osac-project/osac and osac-project/osac-test-infra. Tide will no longer process these repos.

All Prow plugins are unchanged_pluginconfig.yaml is NOT modified. Plugins (lgtm, approve, jira, hold, wip, lifecycle, etc.) continue setting labels via OWNERS files.

Why

OSAC is migrating to GitHub merge queue for merge automation. Tide cannot retest PRs against latest main when using GitHub Actions checks (only works with native Prow jobs). See how-osac-ci-works §21.

What changes

File Before After
osac/_prowconfig.yaml Tide query requiring lgtm + approved + jira/valid-reference {} (empty — Tide ignores repo)
osac-test-infra/_prowconfig.yaml Tide query requiring lgtm + approved + jira/valid-reference {} (empty — Tide ignores repo)
osac/_pluginconfig.yaml Prow plugins configured No change
osac-test-infra/_pluginconfig.yaml Prow plugins configured No change

What stays the same

  • /lgtm, /approve, /hold commands via Prow plugins
  • OWNERS-based review assignments
  • Jira validation (jira/valid-reference label)
  • All other Prow plugins (assign, blunderbuss, lifecycle, wip, etc.)

New merge flow

A label-gate GitHub Action (companion osac PR) reads Prow-set labels and converts them to a status check. GitHub merge queue gates on that check + E2E results.

Companion PRs

  1. osac-project/osac — add label-gate.yml workflow
  2. OSAC-3734: enable merge queue for osac monorepo osac-project/github-config#180 — enable merge queue, require label-gate check
  3. This PR — remove Tide queries

🤖 Generated with Claude Code

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-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@omer-vishlitzky: 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.

Interacting with pj-rehearse

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.

1 similar comment
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@omer-vishlitzky: 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.

Interacting with pj-rehearse

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.

@openshift-ci

openshift-ci Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

@omer-vishlitzky: 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.

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 9, 2026
@masayag

masayag commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

/lgtm
/approve

@openshift-ci

openshift-ci Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: masayag, omer-vishlitzky

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:

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

@openshift-merge-bot
openshift-merge-bot Bot merged commit c4fe56e into openshift:main Aug 9, 2026
12 checks passed
@openshift-ci

openshift-ci Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

@omer-vishlitzky: Updated the following 2 configmaps:

  • config configmap in namespace ci at cluster core-ci using the following files:
    • key core-services-prow-02_config-osac-project-osac-test-infra-_prowconfig.yaml using file ``
    • key core-services-prow-02_config-osac-project-osac-_prowconfig.yaml using file ``
  • config configmap in namespace ci at cluster app.ci using the following files:
    • key core-services-prow-02_config-osac-project-osac-test-infra-_prowconfig.yaml using file ``
    • key core-services-prow-02_config-osac-project-osac-_prowconfig.yaml using file ``
Details

In response to this:

Summary

Remove Tide merge queries for osac-project/osac and osac-project/osac-test-infra. Tide will no longer process these repos.

All Prow plugins are unchanged_pluginconfig.yaml is NOT modified. Plugins (lgtm, approve, jira, hold, wip, lifecycle, etc.) continue setting labels via OWNERS files.

Why

OSAC is migrating to GitHub merge queue for merge automation. Tide cannot retest PRs against latest main when using GitHub Actions checks — its staleness detection only works with native Prow jobs. With zero Prow presubmits configured, Tide's per-context staleness bookkeeping iterates an empty list and never executes. Its merge gate only checks whether a required GitHub Actions check is currently reporting success, with no concept of "was this success computed against an old base SHA." This is confirmed upstream behavior (prow#356, test-infra#20713, test-infra#30628).

What changes

File Before After
osac/_prowconfig.yaml Tide query requiring lgtm + approved + jira/valid-reference {} (empty — Tide ignores repo)
osac-test-infra/_prowconfig.yaml Tide query requiring lgtm + approved + jira/valid-reference {} (empty — Tide ignores repo)
osac/_pluginconfig.yaml Prow plugins configured No change
osac-test-infra/_pluginconfig.yaml Prow plugins configured No change

What stays the same

  • /lgtm, /approve, /hold commands via Prow plugins
  • OWNERS-based review assignments
  • Jira validation (jira/valid-reference label)
  • All other Prow plugins (assign, blunderbuss, lifecycle, wip, etc.)

New merge flow

A label-gate GitHub Action (companion osac PR) reads Prow-set labels and converts them to a status check. GitHub merge queue gates on that check + E2E results.

Companion PRs

  1. OSAC-3734: add label-gate workflow for merge queue osac-project/osac#204 — add label-gate.yml workflow
  2. OSAC-3734: enable merge queue for osac monorepo osac-project/github-config#180 — enable merge queue, require label-gate check
  3. This PR — remove Tide queries

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Removed Tide merge queries for osac-project/osac and osac-project/osac-test-infra.
  • GitHub native merge queue automation can manage merges for these repositories.
  • Prow plugin configurations remain unchanged.

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.

TimurMP pushed a commit to TimurMP/release that referenced this pull request Aug 9, 2026
…openshift#83121)

* osac: strip Tide queries to jira-only

* osac-test-infra: strip Tide queries to jira-only

* OSAC-3734: osac: remove Tide merge queries (merge queue replaces Tide)

* OSAC-3734: osac-test-infra: remove Tide merge queries (merge queue replaces Tide)

* OSAC-3734: fix checkconfig — use empty queries list, not empty doc

* OSAC-3734: fix checkconfig — use empty queries list, not empty doc

* OSAC-3734: use unreachable label to disable Tide (checkconfig requires repo reference)

* OSAC-3734: use unreachable label to disable Tide (checkconfig requires repo reference)

* OSAC-3734: delete Tide config (merge queue replaces Tide)

* OSAC-3734: delete Tide config (merge queue replaces Tide)
jzding pushed a commit to jzding/release that referenced this pull request Aug 11, 2026
…openshift#83121)

* osac: strip Tide queries to jira-only

* osac-test-infra: strip Tide queries to jira-only

* OSAC-3734: osac: remove Tide merge queries (merge queue replaces Tide)

* OSAC-3734: osac-test-infra: remove Tide merge queries (merge queue replaces Tide)

* OSAC-3734: fix checkconfig — use empty queries list, not empty doc

* OSAC-3734: fix checkconfig — use empty queries list, not empty doc

* OSAC-3734: use unreachable label to disable Tide (checkconfig requires repo reference)

* OSAC-3734: use unreachable label to disable Tide (checkconfig requires repo reference)

* OSAC-3734: delete Tide config (merge queue replaces Tide)

* OSAC-3734: delete Tide config (merge queue replaces Tide)
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants