Skip to content

Commit c751772

Browse files
committed
fix(ci): stabilize released-state dump hash
1 parent 442fea5 commit c751772

1 file changed

Lines changed: 14 additions & 2 deletions

File tree

‎scripts/ci/ordinary-server-upgrade-e2e.sh‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,14 @@ FILES_0138="$(sudo sha256sum \
309309
/etc/systemd/system/agentnet-c0-responder.service \
310310
/etc/systemd/system/agentnet-credential-renew.service \
311311
/etc/systemd/system/agentnet-credential-renew.timer | sha256sum | cut -d' ' -f1)"
312+
# PostgreSQL 18 randomizes the plain-dump psql restrict key by default.
313+
# Fix it only for this locally controlled, hash-only test dump so repeated
314+
# outputs compare database content rather than transport nonce material.
312315
DATABASE_0138="$(sudo -u agentnet pg_dump \
313-
--no-owner --no-privileges --dbname=agentnet | sha256sum | cut -d' ' -f1)"
316+
--no-owner --no-privileges \
317+
--restrict-key=AgentNetReleasedMarkerState0138 \
318+
--dbname=agentnet | sha256sum | cut -d' ' -f1)"
319+
echo "released 0.1.38 marker baseline: captured"
314320

315321
assert_rejection() {
316322
local output="$1"
@@ -337,7 +343,10 @@ assert_released_state_unchanged() {
337343
sudo test ! -e /var/lib/agentnet-c0/terminal.json
338344
[[ "$(sudo -u agentnet psql -Atq --dbname=agentnet -c "SELECT value FROM metadata WHERE key='schema_version'")" == "$SCHEMA_0138" ]]
339345
[[ "$(sudo -u agentnet psql -Atq --dbname=agentnet -c 'SELECT COALESCE(MAX(version),0) FROM schema_migrations')" == "$MIGRATION_MAX_0138" ]]
340-
[[ "$(sudo -u agentnet pg_dump --no-owner --no-privileges --dbname=agentnet | sha256sum | cut -d' ' -f1)" == "$DATABASE_0138" ]]
346+
[[ "$(sudo -u agentnet pg_dump \
347+
--no-owner --no-privileges \
348+
--restrict-key=AgentNetReleasedMarkerState0138 \
349+
--dbname=agentnet | sha256sum | cut -d' ' -f1)" == "$DATABASE_0138" ]]
341350
[[ "$(sudo sha256sum \
342351
/var/lib/agentnet/agentnet.json \
343352
/var/lib/agentnet/oidc-enrollment.json \
@@ -370,19 +379,22 @@ assert_released_state_unchanged() {
370379
plan_setup "$PREFIX_CANDIDATE" "$PLAN_CANDIDATE"
371380
DIGEST_CANDIDATE="$(jq -r '.request_digest' "$PLAN_CANDIDATE")"
372381
assert_released_state_unchanged
382+
echo "candidate plan: released state unchanged"
373383

374384
APPLY_CANDIDATE_EXIT=0
375385
apply_setup "$PREFIX_CANDIDATE" "$DIGEST_CANDIDATE" "$APPLY_CANDIDATE" || APPLY_CANDIDATE_EXIT=$?
376386
[[ "$APPLY_CANDIDATE_EXIT" -eq 1 ]]
377387
assert_rejection "$APPLY_CANDIDATE"
378388
assert_released_state_unchanged
389+
echo "candidate apply refusal: released state unchanged"
379390

380391
RETRY_CANDIDATE_EXIT=0
381392
apply_setup "$PREFIX_CANDIDATE" "$DIGEST_CANDIDATE" "$RETRY_CANDIDATE" || RETRY_CANDIDATE_EXIT=$?
382393
[[ "$RETRY_CANDIDATE_EXIT" -eq 1 ]]
383394
assert_rejection "$RETRY_CANDIDATE"
384395
cmp --silent "$APPLY_CANDIDATE" "$RETRY_CANDIDATE"
385396
assert_released_state_unchanged
397+
echo "candidate retry refusal: released state unchanged"
386398

387399
! grep -Fq "$TOKEN" \
388400
"$PLAN_0138" "$PLAN_0138.stderr" "$APPLY_0138" "$APPLY_0138.stderr" \

0 commit comments

Comments
 (0)