lei.chen/myxce
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(eliminate-frontend-makefile): task 3.1 - fix run-resource-verify.sh discovery

Browse source 
APISERVER_BIN's default changes from the fixed /tmp/apiserver path
to $BUILD_DIR/frontend/apiserver/xce_apiserver, matching the sibling
BINARY/SCHED_BIN/XT convention exactly (no dual-path fallback, per
research.md's explicit Design Decision). Failure message now names
/xce-build apiserver instead of the Makefile target.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XYdtrEWWZfKRRGED7raEYg
This commit is contained in:
Rongsong Shen 2026-09-03 13:54:57 +00:00
parent 454c76f74c
commit ff051e0e86
No known key found for this signature in database
GPG key ID: 5BCDAAE0123E9FE2
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.claude/skills/xce-test-resources/run-resource-verify.sh
View file

@ -200,7 +200,7 @@ DEPLOY_HA="$REPO/src/tools/deploy-ha.sh"
BUILD_DIR="${XCE_RESVERIFY_BUILD_DIR:-$REPO/src/xce.build}"
BINARY="${XCE_RESVERIFY_BIN:-$BUILD_DIR/controller/xce_controller}"
SCHED_BIN="${XCE_RESVERIFY_SCHED_BIN:-$BUILD_DIR/scheduler/xce_scheduler}"
APISERVER_BIN="${XCE_RESVERIFY_APISERVER_BIN:-/tmp/apiserver}"
APISERVER_BIN="${XCE_RESVERIFY_APISERVER_BIN:-$BUILD_DIR/frontend/apiserver/xce_apiserver}"
# xce_test -- drives injection (task 6.1) via its worker-context `join`/
# `resupdate` commands (same binary xce-test-ha's run-ha-soak.sh uses, same
# build dir as $BINARY since both come from the controller meson target).
@ -347,7 +347,7 @@ register_trap() {
precondition_checks() {
[ -x "$BINARY" ] || fail "controller binary missing: $BINARY (run /xce-build controller)"
[ -x "$SCHED_BIN" ] || fail "scheduler binary missing: $SCHED_BIN (run /xce-build scheduler) -- required, this skill verifies the scheduler layer"
[ -x "$APISERVER_BIN" ] || fail "apiserver binary missing: $APISERVER_BIN (cd src/frontend && make build-server, or the CGO-flags workaround -- see tasks.md's Implementation Notes) -- required, this skill verifies the apiserver layer"
[ -x "$APISERVER_BIN" ] || fail "apiserver binary missing: $APISERVER_BIN (run /xce-build apiserver) -- required, this skill verifies the apiserver layer"
[ -x "$XT" ] || fail "xce_test binary missing: $XT (run /xce-build controller) -- required to join a synthetic worker and run resupdate"
command -v nix >/dev/null 2>&1 || fail "nix not found on PATH -- required to resolve the deploy-environment bash and invoke deploy-ha.sh"
}

2
.kiro/specs/eliminate-frontend-makefile/tasks.md
View file

@ -22,7 +22,7 @@
- _Boundary: xce-build.sh_
- [ ] 3. Integration: eliminate every remaining live reference to the Makefile
- [ ] 3.1 (P) Fix run-resource-verify.sh's apiserver-binary discovery
- [x] 3.1 (P) Fix run-resource-verify.sh's apiserver-binary discovery
- Change `APISERVER_BIN`'s default from the fixed `/tmp/apiserver` path to the same `$BUILD_DIR/<component>/<binary>`-relative convention its sibling binaries (`BINARY`, `SCHED_BIN`, `XT`) already use, and update its failure message to name `/xce-build apiserver` instead of the Makefile target
- Observable: with a binary present only in the Meson build dir (no `/tmp/apiserver`), the script locates and uses it; with neither present, the failure message names `/xce-build apiserver`, not `make build-server`
- _Requirements: 5.1, 5.2, 5.3_