Partial merge pull request #8287 from Agoric/mhofman/8279-atomic-swin…

…gset-upgrade-plan Atomic swingset upgrade actions
Agoric · Nov 8, 2023 · 82e416f · 82e416f
2 parents ae6e6d5 + 875b03c
commit 82e416f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/packages/deployment/upgrade-test/Dockerfile b/packages/deployment/upgrade-test/Dockerfile
@@ -93,9 +93,7 @@ ARG DEST_IMAGE
 #this is agoric-upgrade-10 upgrading to 11
 #it's a separate target because agoric-upgrade-10 takes so long to test
 FROM ghcr.io/agoric/agoric-sdk:35 as propose-agoric-upgrade-11
-# This default UPGRADE_INFO_11 is to test core proposals like the network vat.
-# TODO: Maybe replace with a Zoe core proposal, or remove when other paths test it.
-ARG BOOTSTRAP_MODE UPGRADE_INFO_11='{"coreProposals":["@agoric/vats/scripts/init-network.js"]}'
+ARG BOOTSTRAP_MODE UPGRADE_INFO_11
 ENV THIS_NAME=propose-agoric-upgrade-11 UPGRADE_TO=agoric-upgrade-11 UPGRADE_INFO=${UPGRADE_INFO_11} BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
 WORKDIR /usr/src/agoric-sdk/
 COPY ./bash_entrypoint.sh ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/

diff --git a/packages/deployment/upgrade-test/Makefile b/packages/deployment/upgrade-test/Makefile
@@ -56,11 +56,14 @@ DEBUG ?= SwingSet:ls,SwingSet:vat
 RUN = docker run --rm -it \
 	-p 26656:26656 -p 26657:26657 -p 1317:1317 \
 	-v "$${PWD}:/workspace" \
-	-e "DEST=1" -e "DEBUG=$(DEBUG)"
+	-e "DEBUG=$(DEBUG)"
 
 run:
-	$(RUN) -e "TMUX_USE_CC=$(tmuxCC)" \
+	$(RUN) -e "DEST=1" -e "TMUX_USE_CC=$(tmuxCC)" \
 		--entrypoint /usr/src/agoric-sdk/upgrade-test-scripts/start_to_to.sh \
 		 $(REPOSITORY):$(dockerLabel)
 
+run_test:
+	$(RUN) -e "DEST=0" $(REPOSITORY):$(dockerLabel)
+
 .PHONY: local_sdk agoric-upgrade-7-2 agoric-upgrade-8 agoric-upgrade-8-1 agoric-upgrade-9 agoric-upgrade-10 agoric-upgrade-11 agoric-upgrade-12 build build_test run
diff --git a/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/pre_test.sh b/packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/pre_test.sh
@@ -2,12 +2,12 @@
 
 . ./upgrade-test-scripts/env_setup.sh
 
-echo Wait for upgrade to settle
-waitForBlock 5
-
 # CWD is agoric-sdk
 upgrade12=./upgrade-test-scripts/agoric-upgrade-12
 
+# test that the network vat was installed (see UPGRADE_INFO_12)
+test_val "$(yarn --silent node $upgrade12/tools/vat-status.mjs network)" "0" "network vat incarnation"
+
 test_val "$(agd query vstorage children published.boardAux -o json | jq .children)" "[]" "no boardAux children yet"
 
 # zoe vat is at incarnation 0