Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
omer-vishlitzky wants to merge 6 commits into
base: main
Choose a base branch
from
+2 −28
Open

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de4316c
osac: strip Tide queries to jira-only
omer-vishlitzky Aug 7, 2026
0ae35da
osac-test-infra: strip Tide queries to jira-only
omer-vishlitzky Aug 7, 2026
b2279b9
OSAC-3734: osac: remove Tide merge queries (merge queue replaces Tide)
omer-vishlitzky Aug 7, 2026
7c48009
OSAC-3734: osac-test-infra: remove Tide merge queries (merge queue re…
omer-vishlitzky Aug 7, 2026
8eb7529
OSAC-3734: fix checkconfig — use empty queries list, not empty doc
omer-vishlitzky Aug 7, 2026
c8d7d3e
OSAC-3734: fix checkconfig — use empty queries list, not empty doc
omer-vishlitzky Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions core-services/prow/02_config/osac-project/osac-test-infra/_prowconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1 @@
tide:
queries:
- labels:
- approved
- jira/valid-reference
- lgtm
missingLabels:
- backports/unvalidated-commits
- do-not-merge/hold
- do-not-merge/invalid-owners-file
- do-not-merge/work-in-progress
- jira/invalid-bug
- needs-rebase
repos:
- osac-project/osac-test-infra
{}

@coderabbitai coderabbitai Bot Aug 7, 2026

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.

🗄️ 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' || true

Repository: 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.yaml

Repository: 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
done

Repository: 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
done

Repository: 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

16 changes: 1 addition & 15 deletions core-services/prow/02_config/osac-project/osac/_prowconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1 @@
tide:
queries:
- labels:
- approved
- jira/valid-reference
- lgtm
missingLabels:
- backports/unvalidated-commits
- do-not-merge/hold
- do-not-merge/invalid-owners-file
- do-not-merge/work-in-progress
- jira/invalid-bug
- needs-rebase
repos:
- osac-project/osac
{}