OSAC-3734: osac-project: remove Tide merge queries, keep Prow plugins - #83121
OSAC-3734: osac-project: remove Tide merge queries, keep Prow plugins#83121omer-vishlitzky wants to merge 6 commits into
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@omer-vishlitzky: This pull request explicitly references no jira issue. DetailsIn response to this:
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. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: omer-vishlitzky The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
approved
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (2)
🚧 Files skipped from review as they are similar to previous changes (1)
WalkthroughThe PR replaces the Tide query lists for ChangesOSAC Tide configuration
Estimated code review effort: 1 (Trivial) | ~2 minutes Suggested reviewers: 🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
openshift-merge-bot
Bot
added
the
rehearsals-ack
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
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/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
📒 Files selected for processing (2)
core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yamlcore-services/prow/02_config/osac-project/osac/_prowconfig.yaml
| - needs-rebase | ||
| repos: | ||
| - osac-project/osac-test-infra | ||
| {} |
There was a problem hiding this comment.
🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
set -euo pipefail
rg -n -C 12 \
-e 'osac-project/osac-test-infra' \
-e 'osac-project/osac($|[^-])' \
core-services/prow --glob '*.yaml' --glob '*.yml' || true
rg -n -C 10 \
'^[[:space:]]*tide:|^[[:space:]]*queries:|^[[:space:]]*repos:' \
core-services/prow --glob '*.yaml' --glob '*.yml' || trueRepository: openshift/release
Length of output: 50374
🏁 Script executed:
set -euo pipefail
for f in \
core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml \
core-services/prow/02_config/osac-project/osac/_prowconfig.yaml
do
echo "=== $f ==="
cat -n "$f"
done
echo "=== exact repository references ==="
rg -n -C 8 \
'(^|[^[:alnum:]_-])osac-project/osac-test-infra([^[:alnum:]_-]|$)|(^|[^[:alnum:]_-])osac-project/osac([^[:alnum:]_-]|$)' \
core-services/prow \
--glob '*.yaml' --glob '*.yml' \
--glob '!**/osac-project/osac-test-infra/_prowconfig.yaml' \
--glob '!**/osac-project/osac/_prowconfig.yaml' \
| head -n 300 || true
echo "=== file-local history diff ==="
git diff --unified=30 -- \
core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml \
core-services/prow/02_config/osac-project/osac/_prowconfig.yamlRepository: openshift/release
Length of output: 8823
🏁 Script executed:
set -euo pipefail
echo "=== nearby Prow configuration files ==="
fd -t f '_prowconfig\.yaml$|_config\.yaml$|prowconfig' core-services/prow/02_config \
| sort | head -n 300
echo "=== exact repository references in all tracked files ==="
git grep -n -E '(^|[^[:alnum:]_-])osac-project/osac-test-infra([^[:alnum:]_-]|$)|(^|[^[:alnum:]_-])osac-project/osac([^[:alnum:]_-]|$)' -- \
':!core-services/prow/02_config/osac-project/osac-test-infra/_pluginconfig.yaml' \
':!core-services/prow/02_config/osac-project/osac/_pluginconfig.yaml' \
| head -n 300 || true
echo "=== current and parent revisions ==="
for f in \
core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml \
core-services/prow/02_config/osac-project/osac/_prowconfig.yaml
do
echo "--- $f at HEAD ---"
git show "HEAD:$f" 2>/dev/null || true
echo "--- $f at HEAD^ ---"
git show "HEAD^:$f" 2>/dev/null || true
doneRepository: openshift/release
Length of output: 22853
🏁 Script executed:
set -euo pipefail
echo "=== global Prow configuration ==="
cat -n core-services/prow/02_config/_config.yaml
echo "=== osac Prow configuration files ==="
git ls-files \
'core-services/prow/02_config/*/*/_prowconfig.yaml' \
'core-services/prow/02_config/*/_prowconfig.yaml' \
| rg '/osac(-test-infra)?/_prowconfig\.yaml$' || true
echo "=== exact repository references outside plugin configuration ==="
git grep -n -E '(^|[^[:alnum:]_-])osac-project/osac-test-infra([^[:alnum:]_-]|$)|(^|[^[:alnum:]_-])osac-project/osac([^[:alnum:]_-]|$)' -- \
':!core-services/prow/02_config/osac-project/osac-test-infra/_pluginconfig.yaml' \
':!core-services/prow/02_config/osac-project/osac/_pluginconfig.yaml' || true
echo "=== current and parent revisions ==="
for f in \
core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml \
core-services/prow/02_config/osac-project/osac/_prowconfig.yaml
do
echo "--- $f at HEAD ---"
git show "HEAD:$f" 2>/dev/null || true
echo "--- $f at HEAD^ ---"
git show "HEAD^:$f" 2>/dev/null || true
doneRepository: openshift/release
Length of output: 47183
Restore the Tide query for osac-project/osac-test-infra.
No equivalent global query replaces the query requiring jira/valid-reference and blocking labels. Restore it in core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml. The osac configuration has no corresponding removed query.
📍 Affects 2 files
core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml#L1-L1(this comment)core-services/prow/02_config/osac-project/osac/_prowconfig.yaml#L1-L1
🤖 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/osac-project/osac-test-infra/_prowconfig.yaml`
at 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.
Sources: Coding guidelines, Learnings
omer-vishlitzky
changed the title
|
@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. DetailsIn response to this:
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. |
|
[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: |
1 similar comment
|
[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: |
|
@omer-vishlitzky: The following test failed, say
Full PR test history. Your PR dashboard. 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. I understand the commands that are listed here. |
2 participants
Summary
Remove Tide merge queries for
osac-project/osacandosac-project/osac-test-infra. Tide will no longer process these repos.All Prow plugins are unchanged —
_pluginconfig.yamlis 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
osac/_prowconfig.yaml{}(empty — Tide ignores repo)osac-test-infra/_prowconfig.yaml{}(empty — Tide ignores repo)osac/_pluginconfig.yamlosac-test-infra/_pluginconfig.yamlWhat stays the same
/lgtm,/approve,/holdcommands via Prow pluginsjira/valid-referencelabel)New merge flow
A
label-gateGitHub 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
label-gate.ymlworkflow🤖 Generated with Claude Code
Summary by CodeRabbit
osac-project/osacandosac-project/osac-test-infra._pluginconfig.yamlis unchanged.checkconfigvalidation passes.