code-infra-01
82ddca6521
ci/woodpecker/pr/ci Pipeline was successful
For a fork PR, pr-metadata's headRepository names the fork (e.g.
stack-mos-dt-0/stack), and pr-merge passed it to ci-queue-wait via -R.
Woodpecker posts commit statuses on the BASE repository, so the guard read
statuses:null from the fork and every fork merge aborted with
state=malformed rc=3 (#1215, gate-merge-01 B1; standalone queue-wait
against the base repo returns terminal-success on the same sha). Same
family as d339e8fd.
- pr-metadata.sh: normalize baseRepository from Gitea base.repo.full_name
- pr-merge.sh: pass the BASE repo to the queue guard; head repo remains
for head-sha identity; origin-repo fallback when metadata carries no
base repository (correct for same-repo PRs)
- test-pr-merge-fork-ci-status.sh: fork-PR regression, CI-reachable via
test:framework-shell beside its siblings; asserts the guard NEVER sees
the fork and gets the base repo, head branch and exact sha
- test-pr-merge-queue-branch.sh: its old -R assertion pinned the fork
repo, i.e. the bug; now asserts the base repo
72 lines
2.2 KiB
Bash
72 lines
2.2 KiB
Bash
#!/usr/bin/env bash
|
|
# RM-03: pr-merge must guard the PR head branch, not its main base branch.
|
|
|
|
set -euo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
WORK_DIR="${MOSAIC_TEST_WORK_DIR:-$PWD/.mosaic-test-work/pr-merge-queue-branch}"
|
|
FIXTURE_DIR="$WORK_DIR/tools/git"
|
|
CALL_LOG="$WORK_DIR/queue-call.log"
|
|
|
|
rm -rf "$WORK_DIR"
|
|
mkdir -p "$FIXTURE_DIR"
|
|
cp "$SCRIPT_DIR/pr-merge.sh" "$FIXTURE_DIR/pr-merge.sh"
|
|
cp "$SCRIPT_DIR/detect-platform.sh" "$FIXTURE_DIR/detect-platform.sh"
|
|
|
|
cat > "$FIXTURE_DIR/pr-metadata.sh" <<'SH'
|
|
#!/usr/bin/env bash
|
|
printf '%s\n' '{"baseRefName":"main","baseRepository":"mosaicstack/stack","headRefName":"fix/rm-03-fixture","headRefOid":"0123456789abcdef0123456789abcdef01234567","headRepository":"contributor/widgets-fork"}'
|
|
SH
|
|
|
|
cat > "$FIXTURE_DIR/ci-queue-wait.sh" <<'SH'
|
|
#!/usr/bin/env bash
|
|
printf '%s\n' "$*" > "${MOSAIC_QUEUE_CALL_LOG:?}"
|
|
exit 42
|
|
SH
|
|
chmod +x "$FIXTURE_DIR"/*.sh
|
|
|
|
set +e
|
|
(
|
|
cd "$WORK_DIR"
|
|
export MOSAIC_QUEUE_CALL_LOG="$CALL_LOG"
|
|
"$FIXTURE_DIR/pr-merge.sh" -n 123
|
|
) >/dev/null 2>&1
|
|
rc=$?
|
|
set -e
|
|
|
|
if [[ "$rc" -ne 42 ]]; then
|
|
echo "FAIL: expected queue stub rc=42 to propagate, got $rc" >&2
|
|
exit 1
|
|
fi
|
|
if [[ ! -s "$CALL_LOG" ]]; then
|
|
echo "FAIL: merge wrapper did not invoke the queue guard" >&2
|
|
exit 1
|
|
fi
|
|
if ! grep -q -- '-B fix/rm-03-fixture' "$CALL_LOG"; then
|
|
echo "FAIL: merge queue guard did not receive PR head branch" >&2
|
|
cat "$CALL_LOG" >&2
|
|
exit 1
|
|
fi
|
|
if grep -q -- '-B main' "$CALL_LOG"; then
|
|
echo "FAIL: merge queue guard still received the main base branch" >&2
|
|
cat "$CALL_LOG" >&2
|
|
exit 1
|
|
fi
|
|
if ! grep -q -- '-R mosaicstack/stack' "$CALL_LOG"; then
|
|
echo "FAIL: merge queue guard did not receive the BASE repository for CI status" >&2
|
|
cat "$CALL_LOG" >&2
|
|
exit 1
|
|
fi
|
|
if grep -q -- '-R contributor/widgets-fork' "$CALL_LOG"; then
|
|
echo "FAIL: merge queue guard received the fork head repository (B1: statuses are posted on the base repo)" >&2
|
|
cat "$CALL_LOG" >&2
|
|
exit 1
|
|
fi
|
|
if ! grep -q -- '--sha 0123456789abcdef0123456789abcdef01234567' "$CALL_LOG"; then
|
|
echo "FAIL: merge queue guard did not receive the exact PR head SHA" >&2
|
|
cat "$CALL_LOG" >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "pr-merge queue branch/repository/SHA regression passed"
|