fixup test runner

.github/workflows/ci.yml

@@ -31,8 +31,6 @@ jobs:
           df -h
       - uses: actions/checkout@v3
       - run: yarn global add tsx
-      - name: generate Dockerfile
-        run: ./makeDockerfile.ts
       - name: build test images
         run: ./buildTestImages.ts
       - name: run test images

README.md

@@ -78,8 +78,6 @@ To add a proposal, see [./CONTRIBUTING.md]
 
 - [ ] include a way to test soft patches that weren't proposals (e.g. PismoB)
 - [ ] documentation and tooling for debugging
-- [ ] separate console output for agd and the scripts (had been with tmux before but trouble, try Docker compose)
-- [ ] remove use of `agoric-sdk:dev`; that's a concern of SDK
-- [ ] separate agd and actions/test services with docker-compose (https://github.com/Agoric/agoric-sdk/discussions/8480#discussioncomment-7438329)
+- [ ] separate console output for agd and the scripts (had been with tmux before but trouble, try Docker compose https://github.com/Agoric/agoric-sdk/discussions/8480#discussioncomment-7438329)
 - [ ] way to query capdata in one shot (not resorting to follow jsonlines hackery)
 - [ ] within each proposal, separate dirs for supporting files so images don't invalidate

buildTestImages.ts

@@ -4,13 +4,17 @@
 import { parseArgs } from 'node:util';
 import { execSync } from 'node:child_process';
 import { imageNameForProposalTest, readProposals } from './common';
+import { refreshDockerfile } from './makeDockerfile';
+
+refreshDockerfile();
 
 const options = {
   match: { short: 'm', type: 'string' },
+  dry: { type: 'boolean' },
 };
 const { values } = parseArgs({ options });
 
-const { match } = values;
+const { match, dry } = values;
 
 const allProposals = readProposals();
 
@@ -19,10 +23,14 @@ const proposals = match
   : allProposals;
 
 for (const proposal of proposals) {
-  console.log(`\nBuilding test image for proposal ${proposal.proposalName}`);
+  if (!dry) {
+    console.log(`\nBuilding test image for proposal ${proposal.proposalName}`);
+  }
   const { name, target } = imageNameForProposalTest(proposal);
   const cmd = `docker build --tag ${name} --target ${target} .`;
   console.log(cmd);
-  // TODO stream the output
-  execSync(cmd);
+  if (!dry) {
+    // TODO stream the output
+    execSync(cmd);
+  }
 }

common.ts

@@ -12,7 +12,7 @@ type ProposalCommon = {
 };
 
 export type SoftwareUpgradeProposal = ProposalCommon & {
-  sdkVersion: string;
+  sdkImageTag: string;
   planName: string;
   releaseNodes: string;
   type: 'Software Upgrade Proposal';

makeDockerfile.ts

@@ -29,7 +29,7 @@ ENV UPGRADE_TO=${to} THIS_NAME=${agZeroUpgrade}
 # put env functions into shell environment
 RUN echo '. /usr/src/upgrade-test-scripts/env_setup.sh' >> ~/.bashrc
 
-COPY --chmod=755 ./upgrade-test-scripts /usr/src/upgrade-test-scripts
+COPY --link --chmod=755 ./upgrade-test-scripts /usr/src/upgrade-test-scripts
 SHELL ["/bin/bash", "-c"]
 # this is the only layer that starts ag0
 RUN /usr/src/upgrade-test-scripts/start_ag0.sh
@@ -51,7 +51,7 @@ RUN /usr/src/upgrade-test-scripts/start_ag0.sh
 FROM use-${lastProposal.proposalName} as prepare-${proposalName}
 ENV UPGRADE_TO=${planName}
 # base is a fresh sdk image so copy these supports
-COPY  --chmod=755 ./upgrade-test-scripts/*.sh /usr/src/upgrade-test-scripts/
+COPY --link --chmod=755 ./upgrade-test-scripts/*.sh /usr/src/upgrade-test-scripts/
 
 WORKDIR /usr/src/upgrade-test-scripts
 SHELL ["/bin/bash", "-c"]
@@ -63,16 +63,16 @@ RUN ./start_to_to.sh
    * - Start agd with the SDK that has the upgradeHandler
    * - Run any core-evals associated with the proposal (either the ones specified in prepare, or straight from the proposal)
    */
-  EXECUTE({ proposalName, planName, sdkVersion }: SoftwareUpgradeProposal) {
+  EXECUTE({ proposalName, planName, sdkImageTag }: SoftwareUpgradeProposal) {
     return `
 # EXECUTE ${proposalName}
-FROM ghcr.io/agoric/agoric-sdk:${sdkVersion} as execute-${proposalName}
+FROM ghcr.io/agoric/agoric-sdk:${sdkImageTag} as execute-${proposalName}
 ENV THIS_NAME=${planName}
 
 # base is a fresh sdk image so copy these supports
-COPY  --chmod=755 ./upgrade-test-scripts/*.sh /usr/src/upgrade-test-scripts/
+COPY --link --chmod=755 ./upgrade-test-scripts/*.sh /usr/src/upgrade-test-scripts/
 
-COPY --from=prepare-${proposalName} /root/.agoric /root/.agoric
+COPY --link --from=prepare-${proposalName} /root/.agoric /root/.agoric
 
 WORKDIR /usr/src/upgrade-test-scripts
 SHELL ["/bin/bash", "-c"]
@@ -91,7 +91,7 @@ RUN ./start_to_to.sh
 # EVAL ${proposalName}
 FROM use-${lastProposal.proposalName} as eval-${proposalName}
 
-COPY --chmod=755 ./proposals/${proposalIdentifier}:${proposalName} /usr/src/proposals/${proposalIdentifier}:${proposalName}
+COPY --link --chmod=755 ./proposals/${proposalIdentifier}:${proposalName} /usr/src/proposals/${proposalIdentifier}:${proposalName}
 
 WORKDIR /usr/src/upgrade-test-scripts
 SHELL ["/bin/bash", "-c"]
@@ -110,10 +110,10 @@ RUN ./run_eval.sh ${proposalIdentifier}:${proposalName}
 # USE ${proposalName}
 FROM ${previousStage}-${proposalName} as use-${proposalName}
 
-COPY --chmod=755 ./proposals/${proposalIdentifier}:${proposalName} /usr/src/proposals/${proposalIdentifier}:${proposalName}
+COPY --link --chmod=755 ./proposals/${proposalIdentifier}:${proposalName} /usr/src/proposals/${proposalIdentifier}:${proposalName}
 
 # XXX for 'lib' dir for JS modules
-COPY --chmod=755 ./upgrade-test-scripts /usr/src/upgrade-test-scripts/
+COPY --link --chmod=755 ./upgrade-test-scripts /usr/src/upgrade-test-scripts/
 # TODO remove network dependencies in stages
 RUN cd /usr/src/upgrade-test-scripts/lib/ && yarn install
 
@@ -138,7 +138,7 @@ FROM use-${proposalName} as test-${proposalName}
 # XXX the test files were already copied in the "use" stage
 WORKDIR /usr/src/upgrade-test-scripts
 SHELL ["/bin/bash", "-c"]
-RUN ./run_tests.sh ${proposalIdentifier}:${proposalName}
+ENTRYPOINT ./run_test.sh ${proposalIdentifier}:${proposalName}
 `;
   },
 };
@@ -171,5 +171,11 @@ for (const proposal of readProposals()) {
   previousProposal = proposal;
 }
 
-const contents = blocks.join('\n');
-fs.writeFileSync('Dockerfile', contents);
+export function refreshDockerfile() {
+  const contents = blocks.join('\n');
+  fs.writeFileSync('Dockerfile', contents);
+}
+
+if (require.main === module) {
+  refreshDockerfile();
+}

proposals/16:upgrade-8/config.json

@@ -1,5 +1,5 @@
 {
-    "sdkVersion": "29",
+    "sdkImageTag": "29",
     "planName": "agoric-upgrade-8",
     "type": "Software Upgrade Proposal"
 }

proposals/16:upgrade-8/use.sh

@@ -3,24 +3,8 @@
 # Exit when any command fails
 set -e
 
-# FIXME fewer assumptions about the environment
 source /usr/src/upgrade-test-scripts/env_setup.sh
 
-# override env (TODO incorporate "upstream" )
-provisionSmartWallet() {
-  addr="$1"
-  amount="$2"
-  echo "funding $addr"
-  agd tx bank send "validator" "$addr" "$amount" -y --keyring-backend=test --chain-id="$CHAINID"
-  waitForBlock
-  echo "provisioning $addr"
-  agd tx swingset provision-one my-wallet "$addr" SMART_WALLET --keyring-backend=test --yes --chain-id="$CHAINID" --from="$addr"
-  echo "Waiting for wallet $addr to reach vstorage"
-  waitForBlock 5
-  echo "Reading $addr from vstorage"
-  agoric wallet show --from "$addr"
-}
-
 sed -i "s/--econCommAcceptOfferId /--previousOfferId /g" "/usr/src/agoric-sdk/packages/agoric-cli/src/commands/psm.js"
 
 #region precheck

proposals/29:upgrade-9/config.json

@@ -1,6 +1,6 @@
 {
     "releaseNotes": "https://github.com/Agoric/agoric-sdk/releases/tag/pismoC",
-    "sdkVersion": "31",
+    "sdkImageTag": "31",
     "planName": "agoric-upgrade-9",
     "type": "Software Upgrade Proposal"
 }

proposals/29:upgrade-9/use.sh

@@ -3,7 +3,6 @@
 # Exit when any command fails
 set -e
 
-# FIXME fewer assumptions about the environment
 source /usr/src/upgrade-test-scripts/env_setup.sh
 
 # NOTE: agoric follow doesn't have the `--first-value-only` parameter in this version

proposals/34:upgrade-10/config.json

@@ -1,6 +1,6 @@
 {
   "releaseNotes": "https://github.com/Agoric/agoric-sdk/releases/tag/mainnet1B-rc3",
-  "sdkVersion": "35",
+  "sdkImageTag": "35",
   "planName": "agoric-upgrade-10",
   "type": "Software Upgrade Proposal"
 }

proposals/43:upgrade-11/config.json

@@ -1,6 +1,6 @@
 {
   "releaseNotes": "https://github.com/Agoric/agoric-sdk/releases/tag/agoric-upgrade-11",
-  "sdkVersion": "36",
+  "sdkImageTag": "36",
   "planName": "agoric-upgrade-11",
   "type": "Software Upgrade Proposal"
 }

proposals/43:upgrade-11/legacy.sh

@@ -1,11 +1,7 @@
 #!/bin/bash
 
-# FIXME fewer assumptions about the environment
 source /usr/src/upgrade-test-scripts/env_setup.sh
 
-# Enable debugging
-set -x
-
 export_genesis() {
   GENESIS_EXPORT_DIR="$1"
   shift

upgrade-test-scripts/env_setup.sh

@@ -77,16 +77,17 @@ waitAgd() {
 }
 
 provisionSmartWallet() {
-  i="$1"
+  addr="$1"
   amount="$2"
-  echo "funding $i"
-  agd tx bank send "validator" "$i" "$amount" -y --keyring-backend=test --chain-id="$CHAINID"
+  echo "funding $addr"
+  agd tx bank send "validator" "$addr" "$amount" -y --keyring-backend=test --chain-id="$CHAINID"
   waitForBlock
-  echo "provisioning $i"
-  agd tx swingset provision-one my-wallet "$i" SMART_WALLET --keyring-backend=test --yes --chain-id="$CHAINID" --from="$i"
-  # give time for wallet to be provisioned and published to vstorage
-  waitForBlock 2
-  agoric wallet show --from $i
+  echo "provisioning $addr"
+  agd tx swingset provision-one my-wallet "$addr" SMART_WALLET --keyring-backend=test --yes --chain-id="$CHAINID" --from="$addr"
+  echo "Waiting for wallet $addr to reach vstorage"
+  waitForBlock 5
+  echo "Reading $addr from vstorage"
+  agoric wallet show --from "$addr"
 }
 
 wait_for_bootstrap() {

upgrade-test-scripts/lib/vat-status.js

@@ -1,6 +1,7 @@
 // @ts-check
 import dbOpenAmbient from 'better-sqlite3';
 import { HOME } from './constants.js';
+import { NonNullish } from './assert.js';
 
 /**
  * @file look up vat incarnation from kernel DB
@@ -66,12 +67,6 @@ const makeSwingstore = db => {
   });
 };
 
-/** @type {<T>(val: T | undefined) => T} */
-const NonNullish = val => {
-  if (!val) throw Error('required');
-  return val;
-};
-
 /**
  * @param {string} vatName
  */

upgrade-test-scripts/run_eval.sh

@@ -3,7 +3,6 @@
 # Note that STDOUT mixes the two. TODO separate them cleanly with log output.
 
 set -e
-set -x
 
 source ./env_setup.sh
 

upgrade-test-scripts/run_tests.sh → upgrade-test-scripts/run_test.sh

@@ -3,7 +3,6 @@
 # Note that STDOUT mixes the two. TODO separate them cleanly with log output.
 
 set -e
-set -x
 
 source ./env_setup.sh
 

upgrade-test-scripts/run_use.sh

@@ -3,7 +3,6 @@
 # Note that STDOUT mixes the two. TODO separate them cleanly with log output.
 
 set -e
-set -x
 
 source ./env_setup.sh