Skip to content

CNTRLPLANE-3278: fix verify-workflows to check PR head, not merge commit #78025

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

Merged
openshift-merge-bot merged 1 commit into from
Apr 20, 2026
+11 −2
Merged

CNTRLPLANE-3278: fix verify-workflows to check PR head, not merge commit #78025

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,12 +490,21 @@ tests:
exit 1
fi
MAIN_REF="FETCH_HEAD"
BASE=$(git merge-base HEAD "$MAIN_REF")
# ci-operator runs on a merge commit (PR merged into base). HEAD is the
# merge result, so workflow files from main are already present. We need
# the actual PR head commit (second parent of the merge) to detect
# outdated files on the PR branch itself.
PR_HEAD=$(git rev-parse HEAD^2 2>/dev/null) || PR_HEAD="HEAD"
BASE=$(git merge-base "$PR_HEAD" "$MAIN_REF")
echo "PR_HEAD: $(git rev-parse "$PR_HEAD")"
echo "MAIN: $(git rev-parse "$MAIN_REF")"
echo "BASE: $BASE"
echo ""
FAILED=0
while IFS= read -r file; do
[ -z "$file" ] && continue
main_hash=$(git rev-parse "${MAIN_REF}:${file}" 2>/dev/null) || continue
head_hash=$(git rev-parse "HEAD:${file}" 2>/dev/null) || head_hash=""
head_hash=$(git rev-parse "${PR_HEAD}:${file}" 2>/dev/null) || head_hash=""
if [ -z "$head_hash" ]; then
echo "MISSING: $file exists on main but not on this branch."
FAILED=1
Expand Down