Merge pull request #8476 from Agoric/8443-drop-upgrade-tests

base upgrade tests on agoric-3-proposals
Agoric · Nov 8, 2023 · 9b4745a · 9b4745a
2 parents cd437ef + 214667f
commit 9b4745a
Show file tree

Hide file tree

Showing 31 changed files with 54 additions and 1,529 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -249,7 +249,9 @@ jobs:
       - name: docker build (sdk)
         # Produces ghcr.io/agoric/agoric-sdk:latest used in the following upgrade test.
         # TODO: Build this only once, not for every bootstrap-version.
-        run: cd packages/deployment && ./scripts/test-docker-build.sh | $TEST_COLLECT
+        # run: cd packages/deployment && ./scripts/test-docker-build.sh | $TEST_COLLECT
+        # XXX skip TAP test output and collection for now; it hides the output from the logs
+        run: cd packages/deployment && make docker-build-sdk
       - name: docker build upgrade test
         run: |
           cd packages/deployment/upgrade-test && \

diff --git a/packages/deployment/upgrade-test/Dockerfile b/packages/deployment/upgrade-test/Dockerfile
@@ -1,147 +1,18 @@
 # Defaults
+ARG BASE_IMAGE=ghcr.io/agoric/agoric-3-proposals:main
 ARG DEST_IMAGE=ghcr.io/agoric/agoric-sdk:dev
 ARG BOOTSTRAP_MODE=main
 
 # TODO different naming scheme for upgrade handler (in app.go) and the image name
 
-###
-# Kinds of layers:
-# START             ag0, start of the chain
-# UPGRADE+TEST      legacy layer type in which the chain upgrade and its tests are comingled
-# UPGRADE           layer that only runs the upgrade handler
-# TEST              layer that only tests a previous upgrade
-# DEST              the final layer this build is producing, opening an interactive shell
-
-## START
-# on agoric-uprade-7-2, with upgrade to agoric-upgrade-8
-FROM ghcr.io/agoric/ag0:agoric-upgrade-7-2 as agoric-upgrade-7-2
-ARG BOOTSTRAP_MODE
-ARG UPGRADE_INFO_8
-ENV UPGRADE_TO=agoric-upgrade-8 UPGRADE_INFO=${UPGRADE_INFO_8} THIS_NAME=agoric-upgrade-7-2 BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
-RUN echo "${BOOTSTRAP_MODE}"
-RUN mkdir -p /usr/src/agoric-sdk/upgrade-test-scripts
-WORKDIR /usr/src/agoric-sdk/
-COPY ./start_ag0.sh ./upgrade-test-scripts/
-COPY ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
-SHELL ["/bin/bash", "-c"]
-# this is the only layer that starts ag0
-RUN . ./upgrade-test-scripts/start_ag0.sh
-
-## UPGRADE+TEST
-## this is agoric-upgrade-8 aka pismoA
-FROM ghcr.io/agoric/agoric-sdk:29 as agoric-upgrade-8
-ARG BOOTSTRAP_MODE
-ENV THIS_NAME=agoric-upgrade-8 BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
-# copy from previous build
-COPY --from=agoric-upgrade-7-2 /root/.agoric /root/.agoric
-
-# boilerplate to copy scripts for this upgrade
-WORKDIR /usr/src/agoric-sdk/
-COPY ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-RUN chmod +x ./upgrade-test-scripts/*.sh
-SHELL ["/bin/bash", "-c"]
-RUN . ./upgrade-test-scripts/start_to_to.sh
-
-## UPGRADE+TEST
-ARG DEST_IMAGE
-#this is agoric-upgrade-8-1 aka pismoB
-FROM ghcr.io/agoric/agoric-sdk:30 as agoric-upgrade-8-1
-ARG BOOTSTRAP_MODE UPGRADE_INFO_9
-ENV THIS_NAME=agoric-upgrade-8-1 UPGRADE_TO=agoric-upgrade-9 UPGRADE_INFO=${UPGRADE_INFO_9} BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
-WORKDIR /usr/src/agoric-sdk/
-COPY ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-COPY --from=agoric-upgrade-8 /root/.agoric /root/.agoric
-RUN chmod +x ./upgrade-test-scripts/*.sh
-SHELL ["/bin/bash", "-c"]
-RUN . ./upgrade-test-scripts/start_to_to.sh
-
-# UPGRADE+TEST
-ARG DEST_IMAGE
-# this is agoric-upgrade-9 / pismoC with upgrade to agoric-upgrade-10
-FROM ghcr.io/agoric/agoric-sdk:31 as agoric-upgrade-9
-ARG BOOTSTRAP_MODE UPGRADE_INFO_10
-ENV THIS_NAME=agoric-upgrade-9 UPGRADE_TO=agoric-upgrade-10 UPGRADE_INFO=${UPGRADE_INFO_10} BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
-
-WORKDIR /usr/src/agoric-sdk/
-COPY ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-COPY --from=agoric-upgrade-8-1 /root/.agoric /root/.agoric
-WORKDIR /usr/src/agoric-sdk/
-RUN chmod +x ./upgrade-test-scripts/*.sh
-SHELL ["/bin/bash", "-c"]
-RUN . ./upgrade-test-scripts/start_to_to.sh
-
-# UPGRADE+TEST
-ARG DEST_IMAGE
-#this is agoric-upgrade-10 / vaults
-FROM ghcr.io/agoric/agoric-sdk:35 as agoric-upgrade-10
-ARG BOOTSTRAP_MODE
-ENV THIS_NAME=agoric-upgrade-10 USE_JS=1 BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
-
-WORKDIR /usr/src/agoric-sdk/
-COPY ./env_setup.sh ./start_to_to.sh ./package.json ./*.js ./upgrade-test-scripts/
-RUN cd upgrade-test-scripts && yarn
-RUN echo '. /usr/src/agoric-sdk/upgrade-test-scripts/env_setup.sh' >> ~/.bashrc
-
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-COPY --from=agoric-upgrade-9 /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
-#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
-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 ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
-RUN cd upgrade-test-scripts && yarn
-RUN echo '. /usr/src/agoric-sdk/upgrade-test-scripts/env_setup.sh' >> ~/.bashrc
-
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-COPY --from=agoric-upgrade-10 /root/.agoric /root/.agoric
-RUN chmod +x ./upgrade-test-scripts/*.sh
-SHELL ["/bin/bash", "-c"]
-RUN . ./upgrade-test-scripts/start_to_to.sh
-
-# TEST
-#this is agoric-upgrade-11 / vaults+1
-ARG DEST_IMAGE
-FROM ghcr.io/agoric/agoric-sdk:36 as agoric-upgrade-11
-ARG BOOTSTRAP_MODE
-ENV THIS_NAME=agoric-upgrade-11 BOOTSTRAP_MODE=${BOOTSTRAP_MODE} USE_JS=1
-# start-chain boilerplate
-WORKDIR /usr/src/agoric-sdk/
-COPY ./env_setup.sh ./start_to_to.sh ./package.json ./*.js ./upgrade-test-scripts/
-RUN cd upgrade-test-scripts && yarn
-RUN echo '. /usr/src/agoric-sdk/upgrade-test-scripts/env_setup.sh' >> ~/.bashrc
-
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-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 propose-agoric-upgrade-12
+FROM ${BASE_IMAGE} 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=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/
-COPY ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
-RUN cd upgrade-test-scripts && yarn
-RUN echo '. /usr/src/agoric-sdk/upgrade-test-scripts/env_setup.sh' >> ~/.bashrc
+ENV THIS_NAME= UPGRADE_TO=agoric-upgrade-12 UPGRADE_INFO=${UPGRADE_INFO_12} BOOTSTRAP_MODE=${BOOTSTRAP_MODE}
 
-COPY ./${THIS_NAME} ./upgrade-test-scripts/${THIS_NAME}/
-RUN chmod +x ./upgrade-test-scripts/*.sh
+WORKDIR /usr/src/agoric-sdk/
+COPY --chmod=755 ./env_setup.sh ./start_to_to.sh ./upgrade-test-scripts/
 SHELL ["/bin/bash", "-c"]
 RUN . ./upgrade-test-scripts/start_to_to.sh
 

diff --git a/packages/deployment/upgrade-test/Makefile b/packages/deployment/upgrade-test/Makefile
@@ -18,28 +18,7 @@ BUILD = docker build --progress=plain $(BUILD_OPTS) \
 	--build-arg BOOTSTRAP_MODE=$(BOOTSTRAP_MODE) --build-arg DEST_IMAGE=$(DEST_IMAGE) \
 	-f Dockerfile upgrade-test-scripts
 
-agoric-upgrade-7-2:
-	$(BUILD) --target agoric-upgrade-7-2 -t $(REPOSITORY):agoric-upgrade-7-2$(TAG_SUFFIX)
-
-agoric-upgrade-8: agoric-upgrade-7-2
-	$(BUILD) --target agoric-upgrade-8 -t $(REPOSITORY):agoric-upgrade-8$(TAG_SUFFIX)
-
-agoric-upgrade-8-1: agoric-upgrade-8
-	$(BUILD) --target agoric-upgrade-8-1 -t $(REPOSITORY):agoric-upgrade-8-1$(TAG_SUFFIX)
-
-agoric-upgrade-9: agoric-upgrade-8-1
-	$(BUILD) --target agoric-upgrade-9 -t $(REPOSITORY):agoric-upgrade-9$(TAG_SUFFIX)
-
-agoric-upgrade-10: agoric-upgrade-9
-	$(BUILD) --target agoric-upgrade-10 -t $(REPOSITORY):agoric-upgrade-10$(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: propose-agoric-upgrade-11
-	$(BUILD) --target agoric-upgrade-11 -t $(REPOSITORY):agoric-upgrade-11$(TAG_SUFFIX)
-
-propose-agoric-upgrade-12: agoric-upgrade-11
+propose-agoric-upgrade-12:
 	$(BUILD) --target propose-agoric-upgrade-12 -t $(REPOSITORY):propose-agoric-upgrade-12$(TAG_SUFFIX)
 
 agoric-upgrade-12: propose-agoric-upgrade-12