From 41962eb1fc522a2ba84c096b134db89c61167fad Mon Sep 17 00:00:00 2001 From: Ikenna Omekam Date: Wed, 30 Aug 2023 14:17:00 -0500 Subject: [PATCH] fixup! test: rename to propose --- packages/deployment/upgrade-test/Dockerfile | 12 ++++++------ packages/deployment/upgrade-test/Makefile | 12 ++++++------ packages/deployment/upgrade-test/Readme.md | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/deployment/upgrade-test/Dockerfile b/packages/deployment/upgrade-test/Dockerfile index eaf912e5a7f..57ebcd04e99 100644 --- a/packages/deployment/upgrade-test/Dockerfile +++ b/packages/deployment/upgrade-test/Dockerfile @@ -92,11 +92,11 @@ RUN . ./upgrade-test-scripts/start_to_to.sh 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 agoric-upgrade-10-to-11 +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/builders/scripts/vats/init-network.js"]}' -ENV THIS_NAME=agoric-upgrade-10-to-11 UPGRADE_TO=agoric-upgrade-11 UPGRADE_INFO=${UPGRADE_INFO_11} BOOTSTRAP_MODE=${BOOTSTRAP_MODE} +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/ COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/ @@ -115,17 +115,17 @@ ENV THIS_NAME=agoric-upgrade-11 BOOTSTRAP_MODE=${BOOTSTRAP_MODE} WORKDIR /usr/src/agoric-sdk/ COPY ./bash_entrypoint.sh ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/ COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/ -COPY --from=agoric-upgrade-10-to-11 /root/.agoric /root/.agoric +COPY --from=propose-agoric-upgrade-11 /root/.agoric /root/.agoric RUN chmod +x ./upgrade-test-scripts/*.sh SHELL ["/bin/bash", "-c"] RUN . ./upgrade-test-scripts/start_to_to.sh # UPGRADE ARG DEST_IMAGE -FROM ghcr.io/agoric/agoric-sdk:36 as agoric-upgrade-11-to-12 +FROM ghcr.io/agoric/agoric-sdk:36 as propose-agoric-upgrade-12 # TODO: Replace with actual Zoe core proposal for upgrade 12 (MCS, Kread, Zoe, restart-contracts, etc) ARG BOOTSTRAP_MODE UPGRADE_INFO_12='{"coreProposals":["@agoric/builders/scripts/vats/init-network.js"]}' -ENV THIS_NAME=agoric-upgrade-11-to-12 UPGRADE_TO=agoric-upgrade-12 UPGRADE_INFO=${UPGRADE_INFO_12} BOOTSTRAP_MODE=${BOOTSTRAP_MODE} +ENV THIS_NAME=propose-agoric-upgrade-12 UPGRADE_TO=agoric-upgrade-12 UPGRADE_INFO=${UPGRADE_INFO_12} BOOTSTRAP_MODE=${BOOTSTRAP_MODE} COPY --from=agoric-upgrade-11 /root/.agoric /root/.agoric # start-chain boilerplate WORKDIR /usr/src/agoric-sdk/ @@ -141,7 +141,7 @@ ARG DEST_IMAGE FROM ${DEST_IMAGE} as agoric-upgrade-12 ARG BOOTSTRAP_MODE ENV THIS_NAME=agoric-upgrade-12 BOOTSTRAP_MODE=${BOOTSTRAP_MODE} -COPY --from=agoric-upgrade-11-to-12 /root/.agoric /root/.agoric +COPY --from=propose-agoric-upgrade-12 /root/.agoric /root/.agoric # start-chain boilerplate WORKDIR /usr/src/agoric-sdk/ COPY ./bash_entrypoint.sh ./env_setup.sh ./start_to_to.sh ./package.json ./*.mjs ./upgrade-test-scripts/ diff --git a/packages/deployment/upgrade-test/Makefile b/packages/deployment/upgrade-test/Makefile index d19855b906f..50baf2d77d2 100644 --- a/packages/deployment/upgrade-test/Makefile +++ b/packages/deployment/upgrade-test/Makefile @@ -38,16 +38,16 @@ agoric-upgrade-9: agoric-upgrade-8-1 agoric-upgrade-10: agoric-upgrade-9 $(BUILD) --target agoric-upgrade-10 -t $(REPOSITORY):agoric-upgrade-10$(TAG_SUFFIX) -agoric-upgrade-10-to-11: agoric-upgrade-10 - $(BUILD) --target agoric-upgrade-10-to-11 -t $(REPOSITORY):agoric-upgrade-10-to-11$(TAG_SUFFIX) +propose-agoric-upgrade-11: agoric-upgrade-10 + $(BUILD) --target propose-agoric-upgrade-11 -t $(REPOSITORY):propose-agoric-upgrade-11$(TAG_SUFFIX) -agoric-upgrade-11: agoric-upgrade-10-to-11 +agoric-upgrade-11: propose-agoric-upgrade-11 $(BUILD) --target agoric-upgrade-11 -t $(REPOSITORY):agoric-upgrade-11$(TAG_SUFFIX) -agoric-upgrade-11-to-12: agoric-upgrade-11 - $(BUILD) --target agoric-upgrade-11-to-12 -t $(REPOSITORY):agoric-upgrade-11-to-12$(TAG_SUFFIX) +propose-agoric-upgrade-12: agoric-upgrade-11 + $(BUILD) --target propose-agoric-upgrade-12 -t $(REPOSITORY):propose-agoric-upgrade-12$(TAG_SUFFIX) -agoric-upgrade-12: agoric-upgrade-11-to-12 +agoric-upgrade-12: propose-agoric-upgrade-12 $(BUILD) --target agoric-upgrade-12 -t $(REPOSITORY):agoric-upgrade-12$(TAG_SUFFIX) # build main bootstrap diff --git a/packages/deployment/upgrade-test/Readme.md b/packages/deployment/upgrade-test/Readme.md index bbee33ed594..44a6ce44268 100644 --- a/packages/deployment/upgrade-test/Readme.md +++ b/packages/deployment/upgrade-test/Readme.md @@ -108,10 +108,10 @@ To make the wallet ui talk to your local chain, set the network config to 2. Duplicate the last pair of UPGRADE and TEST blocks 3. Update their number from the UPGRADE / DEST block at the end 4. Make directory for tests (e.g. `agoric-upgrade-12`) -4. Make directory for ugprade (e.g. `agoric-upgrade-11-to-12` with a `.keep`) +4. Make directory for ugprade (e.g. `propose-agoric-upgrade-12` with a `.keep`) 5. Update the UPGRADE/DEST pair to be your new upgrade (THIS_NAME matching the upgrade handler string in app.go) 6. Update the `Makefile` - - the two targets to `Makefile` (e.g. `agoric-upgrade-11-to-12` and `agoric-upgrade-12`) + - the two targets to `Makefile` (e.g. `propose-agoric-upgrade-12` and `agoric-upgrade-12`) - set the default TARGET (e.g. `agoric-upgrade-12`) - add the DEST target to the `.phony` in `Makefile` 7. Test with `make local_sdk build run`