cleanup Options boilerplate (#402)

Co-authored-by: David Boreham <david@bozemanpass.com>

.gitea/workflows/test-deploy.yml

@@ -0,0 +1,39 @@
+name: Deploy Test
+
+on:
+  pull_request:
+    branches: '*'
+  push:
+    branches:
+      - main
+      - ci-test
+
+# Needed until we can incorporate docker startup into the executor container
+env:
+  DOCKER_HOST: unix:///var/run/dind.sock
+
+jobs:
+  test:
+    name: "Run deploy test suite"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Clone project repository"
+        uses: actions/checkout@v3
+      - name: "Install Python"
+        uses: cerc-io/setup-python@v4
+        with:
+          python-version: '3.8'
+      - name: "Print Python version"
+        run: python3 --version
+      - name: "Install shiv"
+        run: pip install shiv
+      - name: "Generate build version file"
+        run: ./scripts/create_build_tag_file.sh
+      - name: "Build local shiv package"
+        run: ./scripts/build_shiv_package.sh
+      - name: Start dockerd # Also needed until we can incorporate into the executor
+        run: |
+          dockerd -H $DOCKER_HOST --userland-proxy=false &
+          sleep 5
+      - name: "Run deploy tests"
+        run: ./tests/deploy/run-deploy-test.sh

.gitea/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Integration Test
+name: Smoke Test
 
 on:
   pull_request:

.github/workflows/test-deploy.yml

@@ -0,0 +1,29 @@
+name: Deploy Test
+
+on:
+  pull_request:
+    branches: '*'
+  push:
+    branches: '*'
+
+jobs:
+  test:
+    name: "Run deploy test suite"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Clone project repository"
+        uses: actions/checkout@v3
+      - name: "Install Python"
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - name: "Print Python version"
+        run: python3 --version
+      - name: "Install shiv"
+        run: pip install shiv
+      - name: "Generate build version file"
+        run: ./scripts/create_build_tag_file.sh
+      - name: "Build local shiv package"
+        run: ./scripts/build_shiv_package.sh
+      - name: "Run deploy tests"
+        run: ./tests/deploy/run-deploy-test.sh

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Test
+name: Smoke Test
 
 on:
   pull_request:

app/build_containers.py

@@ -90,7 +90,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args):
         "CERC_CONTAINER_BASE_DIR": container_build_dir,
         "CERC_HOST_UID": f"{os.getuid()}",
         "CERC_HOST_GID": f"{os.getgid()}",
-        "DOCKER_BUILDKIT": "0"
+        "DOCKER_BUILDKIT": config("DOCKER_BUILDKIT", default="0")
     }
     container_build_env.update({"CERC_SCRIPT_DEBUG": "true"} if debug else {})
     container_build_env.update({"CERC_FORCE_REBUILD": "true"} if force_rebuild else {})

app/data/compose/docker-compose-fixturenet-eth.yml

@@ -2,6 +2,7 @@ version: '3.7'
 
 services:
   fixturenet-eth-bootnode-geth:
+    restart: always
     hostname: fixturenet-eth-bootnode-geth
     env_file:
       - ../config/fixturenet-eth/fixturenet-eth.env
@@ -15,6 +16,7 @@ services:
       - "30303"
 
   fixturenet-eth-geth-1:
+    restart: always
     hostname: fixturenet-eth-geth-1
     cap_add:
       - SYS_PTRACE
@@ -42,6 +44,7 @@ services:
       - "6060"
 
   fixturenet-eth-geth-2:
+    restart: always
     hostname: fixturenet-eth-geth-2
     healthcheck:
       test: ["CMD", "nc", "-v", "localhost", "8545"]
@@ -60,12 +63,14 @@ services:
       - fixturenet_eth_geth_2_data:/root/ethdata
 
   fixturenet-eth-bootnode-lighthouse:
+    restart: always
     hostname: fixturenet-eth-bootnode-lighthouse
     environment:
       RUN_BOOTNODE: "true"
     image: cerc/fixturenet-eth-lighthouse:local
 
   fixturenet-eth-lighthouse-1:
+    restart: always
     hostname: fixturenet-eth-lighthouse-1
     healthcheck:
       test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
@@ -91,6 +96,7 @@ services:
       - "8001"
 
   fixturenet-eth-lighthouse-2:
+    restart: always
     hostname: fixturenet-eth-lighthouse-2
     healthcheck:
       test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]

app/data/compose/docker-compose-fixturenet-optimism.yml

@@ -5,6 +5,7 @@ services:
   # Creates / updates the configuration for L1 contracts deployment
   # Deploys the L1 smart contracts (outputs to volume l1_deployment)
   fixturenet-optimism-contracts:
+    restart: on-failure
     hostname: fixturenet-optimism-contracts
     image: cerc/optimism-contracts:local
     env_file:
@@ -35,6 +36,7 @@ services:
 
   # Generates the config files required for L2 (outputs to volume l2_config)
   op-node-l2-config-gen:
+    restart: on-failure
     image: cerc/optimism-op-node:local
     depends_on:
       fixturenet-optimism-contracts:
@@ -54,6 +56,7 @@ services:
 
   # Initializes and runs the L2 execution client  (outputs to volume l2_geth_data)
   op-geth:
+    restart: always
     image: cerc/optimism-l2geth:local
     depends_on:
       op-node-l2-config-gen:
@@ -76,6 +79,7 @@ services:
 
   # Runs the L2 consensus client (Sequencer node)
   op-node:
+    restart: always
     image: cerc/optimism-op-node:local
     depends_on:
       op-geth:
@@ -103,6 +107,7 @@ services:
 
   # Runs the batcher (takes transactions from the Sequencer and publishes them to L1)
   op-batcher:
+    restart: always
     image: cerc/optimism-op-batcher:local
     depends_on:
       op-node:
@@ -129,6 +134,7 @@ services:
 
   # Runs the proposer (periodically submits new state roots to L1)
   op-proposer:
+    restart: always
     image: cerc/optimism-op-proposer:local
     depends_on:
       op-node:

app/data/compose/docker-compose-foundry.yml

@@ -1,6 +1,7 @@
 # Add-on pod to include foundry tooling within a fixturenet
 services:
   foundry:
+    restart: always
     image: cerc/foundry:local
     command: ["while :; do sleep 600; done"]
     volumes:

app/data/container-build/cerc-builder-js/yarn-local-registry-fixup.sh

@@ -27,8 +27,8 @@ yarn_info_output=$(yarn info --json $versioned_target_package 2>/dev/null)
 # If it doesn't exist there will be no .data.dist.tarball element,
 # and jq will output the string "null"
 package_tarball=$(echo $yarn_info_output | jq -r .data.dist.tarball)
-if [[ $package_tarball == "null" ]]; then
-    echo "FATAL: Target package version ($versioned_target_package) not found" >&2
+if [[ "$yarn_info_output" == "" ||  $package_tarball == "null" ]]; then
+    echo "FATAL: Target package version ($versioned_target_package) not found (or bad npm auth token)" >&2
     exit 1
 fi
 # Code below parses out the values we need

app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile

@@ -6,7 +6,7 @@ RUN go install github.com/go-delve/delve/cmd/dlv@latest
 
 FROM cerc/go-ethereum:local as geth
 
-FROM alpine:latest
+FROM alpine:3.17
 RUN apk add --no-cache python3 python3-dev py3-pip curl wget jq build-base gettext libintl openssl bash bind-tools postgresql-client
 
 COPY --from=delve  /go/bin/dlv /usr/local/bin/

app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/bootnode.sh

@@ -13,22 +13,26 @@ DEBUG_LEVEL=${1:-info}
 
 echo "Starting bootnode"
 
-if [ ! -f "$DATADIR/bootnode/enr.dat" ]; then
-  echo "Generating bootnode enr"
-  lcli \
-    generate-bootnode-enr \
-    --ip $ENR_IP \
-    --udp-port $BOOTNODE_PORT \
-    --tcp-port $BOOTNODE_PORT \
-    --genesis-fork-version $GENESIS_FORK_VERSION \
-    --output-dir $DATADIR/bootnode
-
-  bootnode_enr=`cat $DATADIR/bootnode/enr.dat`
-  echo "- $bootnode_enr" > $TESTNET_DIR/boot_enr.yaml
-
-  echo "Generated bootnode enr and written to $TESTNET_DIR/boot_enr.yaml"
+# Clean up existing ENR dir to avoid node connectivity issues on a restart
+if [ -d "$DATADIR/bootnode" ]; then
+  echo "Removing existing bootnode enr directory"
+  rm -r "$DATADIR/bootnode"
 fi
 
+echo "Generating bootnode enr"
+lcli \
+  generate-bootnode-enr \
+  --ip $ENR_IP \
+  --udp-port $BOOTNODE_PORT \
+  --tcp-port $BOOTNODE_PORT \
+  --genesis-fork-version $GENESIS_FORK_VERSION \
+  --output-dir $DATADIR/bootnode
+
+bootnode_enr=`cat $DATADIR/bootnode/enr.dat`
+echo "- $bootnode_enr" > $TESTNET_DIR/boot_enr.yaml
+
+echo "Generated bootnode enr and written to $TESTNET_DIR/boot_enr.yaml"
+
 exec lighthouse boot_node \
     --testnet-dir $TESTNET_DIR \
     --port $BOOTNODE_PORT \

app/data/repository-list.txt

@@ -1,35 +1,36 @@
-cerc-io/ipld-eth-db
-cerc-io/go-ethereum
-cerc-io/ipld-eth-server
-cerc-io/eth-statediff-service
-cerc-io/eth-statediff-fill-service
-cerc-io/ipld-eth-db-validator
-cerc-io/ipld-eth-beacon-indexer
-cerc-io/ipld-eth-beacon-db
-cerc-io/laconicd
-cerc-io/laconic-sdk
-cerc-io/laconic-registry-cli
-cerc-io/laconic-console
-cerc-io/mobymask-watcher
-cerc-io/watcher-ts
-cerc-io/mobymask-v2-watcher-ts
-cerc-io/MobyMask
-vulcanize/uniswap-watcher-ts
-vulcanize/uniswap-v3-info
-vulcanize/assemblyscript
-cerc-io/eth-probe
-cerc-io/tx-spammer
-dboreham/foundry
-lirewine/gem
-lirewine/debug
-lirewine/crypto
-lirewine/sdk
-telackey/act_runner
-ethereum-optimism/op-geth
-ethereum-optimism/optimism
-pokt-network/pocket-core
-pokt-network/pocket-core-deployments
-cerc-io/azimuth-watcher-ts
-cerc-io/ipld-eth-state-snapshot
-cerc-io/gelato-watcher-ts
-filecoin-project/lotus
+github.com/cerc-io/ipld-eth-db
+github.com/cerc-io/go-ethereum
+github.com/cerc-io/ipld-eth-server
+github.com/cerc-io/eth-statediff-service
+github.com/cerc-io/eth-statediff-fill-service
+github.com/cerc-io/ipld-eth-db-validator
+github.com/cerc-io/ipld-eth-beacon-indexer
+github.com/cerc-io/ipld-eth-beacon-db
+github.com/cerc-io/laconicd
+github.com/cerc-io/laconic-sdk
+github.com/cerc-io/laconic-registry-cli
+github.com/cerc-io/laconic-console
+github.com/cerc-io/mobymask-watcher
+github.com/cerc-io/watcher-ts
+github.com/cerc-io/mobymask-v2-watcher-ts
+github.com/cerc-io/MobyMask
+github.com/vulcanize/uniswap-watcher-ts
+github.com/vulcanize/uniswap-v3-info
+github.com/vulcanize/assemblyscript
+github.com/cerc-io/eth-probe
+github.com/cerc-io/tx-spammer
+github.com/dboreham/foundry
+github.com/lirewine/gem
+github.com/lirewine/debug
+github.com/lirewine/crypto
+github.com/lirewine/sdk
+github.com/telackey/act_runner
+github.com/ethereum-optimism/op-geth
+github.com/ethereum-optimism/optimism
+github.com/pokt-network/pocket-core
+github.com/pokt-network/pocket-core-deployments
+github.com/cerc-io/azimuth-watcher-ts
+github.com/cerc-io/ipld-eth-state-snapshot
+github.com/cerc-io/gelato-watcher-ts
+github.com/filecoin-project/lotus
+git.vdb.to/cerc-io/test-project

app/data/stacks/azimuth/stack.yml

@@ -1,7 +1,7 @@
 version: "1.0"
 name: azimuth
 repos:
-  - cerc-io/azimuth-watcher-ts
+  - github.com/cerc-io/azimuth-watcher-ts
 containers:
   - cerc/watcher-azimuth
 pods:

app/data/stacks/chain-chunker/stack.yml

@@ -2,10 +2,10 @@ version: "1.0"
 name: chain-chunker
 decription: "Stack to build containers for chain-chunker"
 repos:
-  - cerc-io/ipld-eth-state-snapshot
-  - cerc-io/eth-statediff-service
-  - cerc-io/ipld-eth-db
-  - cerc-io/ipld-eth-server
+  - github.com/cerc-io/ipld-eth-state-snapshot
+  - github.com/cerc-io/eth-statediff-service
+  - github.com/cerc-io/ipld-eth-db
+  - github.com/cerc-io/ipld-eth-server
 containers:
   - cerc/ipld-eth-state-snapshot
   - cerc/eth-statediff-service

app/data/stacks/erc20/stack.yml

@@ -1,11 +1,11 @@
 version: "1.0"
 name: erc20-watcher
 repos:
-  - cerc-io/go-ethereum
-  - cerc-io/ipld-eth-db
-  - cerc-io/ipld-eth-server
-  - cerc-io/watcher-ts
-  - dboreham/foundry
+  - github.com/cerc-io/go-ethereum
+  - github.com/cerc-io/ipld-eth-db
+  - github.com/cerc-io/ipld-eth-server
+  - github.com/cerc-io/watcher-ts
+  - github.com/dboreham/foundry
 containers:
   - cerc/foundry
   - cerc/go-ethereum

app/data/stacks/erc721/stack.yml

@@ -1,10 +1,10 @@
 version: "1.0"
 name: erc721-watcher
 repos:
-  - cerc-io/go-ethereum
-  - cerc-io/ipld-eth-db
-  - cerc-io/ipld-eth-server
-  - cerc-io/watcher-ts
+  - github.com/cerc-io/go-ethereum
+  - github.com/cerc-io/ipld-eth-db
+  - github.com/cerc-io/ipld-eth-server
+  - github.com/cerc-io/watcher-ts
 containers:
   - cerc/go-ethereum
   - cerc/go-ethereum-foundry

app/data/stacks/fixturenet-eth-loaded/stack.yml

@@ -2,11 +2,11 @@ version: "1.0"
 name: fixturenet-eth-loaded
 decription: "Loaded Ethereum Fixturenet"
 repos:
-  - cerc-io/go-ethereum
-  - cerc-io/tx-spammer
-  - cerc-io/ipld-eth-server
-  - cerc-io/ipld-eth-db
-  - cerc/go-ethereum
+  - github.com/cerc-io/go-ethereum
+  - github.com/cerc-io/tx-spammer
+  - github.com/cerc-io/ipld-eth-server
+  - github.com/cerc-io/ipld-eth-db
+  - github.com/cerc-io/go-ethereum
 containers:
   - cerc/lighthouse
   - cerc/fixturenet-eth-geth

app/data/stacks/fixturenet-eth-tx/stack.yml

@@ -2,8 +2,8 @@ version: "1.2"
 name: fixturenet-eth-tx
 decription: "Ethereum Fixturenet w/ tx-spammer"
 repos:
-  - cerc-io/go-ethereum
-  - cerc-io/tx-spammer
+  - github.com/cerc-io/go-ethereum
+  - github.com/cerc-io/tx-spammer
   - dboreham/foundry
 containers:
   - cerc/go-ethereum

app/data/stacks/fixturenet-eth/README.md

@@ -66,7 +66,7 @@ It is not necessary to use them all at once, but a complete example follows:
 
 ```
 # Setup
-$ laconic-so setup-repositories --include cerc-io/go-ethereum,cerc-io/ipld-eth-db,cerc-io/ipld-eth-server,cerc-io/ipld-eth-beacon-db,cerc-io/ipld-eth-beacon-indexer,cerc-io/eth-probe,cerc-io/tx-spammer
+$ laconic-so setup-repositories --include github.com/cerc-io/go-ethereum,github.com/cerc-io/ipld-eth-db,github.com/cerc-io/ipld-eth-server,github.com/cerc-io/ipld-eth-beacon-db,github.com/cerc-io/ipld-eth-beacon-indexer,github.com/cerc-io/eth-probe,github.com/cerc-io/tx-spammer
 
 # Build
 $ laconic-so build-containers --include cerc/go-ethereum,cerc/lighthouse,cerc/fixturenet-eth-geth,cerc/fixturenet-eth-lighthouse,cerc/ipld-eth-db,cerc/ipld-eth-server,cerc/ipld-eth-beacon-db,cerc/ipld-eth-beacon-indexer,cerc/eth-probe,cerc/keycloak,cerc/tx-spammer

app/data/stacks/fixturenet-eth/stack.yml

@@ -2,8 +2,8 @@ version: "1.1"
 name: fixturenet-eth
 decription: "Ethereum Fixturenet"
 repos:
-  - cerc-io/go-ethereum
-  - dboreham/foundry
+  - github.com/cerc-io/go-ethereum
+  - github.com/dboreham/foundry
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse

app/data/stacks/fixturenet-laconic-loaded/stack.yml

@@ -2,14 +2,14 @@ version: "1.1"
 name: fixturenet-laconic-loaded
 description: "A full featured laconic fixturenet"
 repos:
-  - cerc-io/laconicd
-  - lirewine/debug
-  - lirewine/crypto
-  - lirewine/gem
-  - lirewine/sdk
-  - cerc-io/laconic-sdk
-  - cerc-io/laconic-registry-cli
-  - cerc-io/laconic-console
+  - github.com/cerc-io/laconicd
+  - github.com/lirewine/debug
+  - github.com/lirewine/crypto
+  - github.com/lirewine/gem
+  - github.com/lirewine/sdk
+  - github.com/cerc-io/laconic-sdk
+  - github.com/cerc-io/laconic-registry-cli
+  - github.com/cerc-io/laconic-console
 npms:
   - laconic-sdk
   - laconic-registry-cli

app/data/stacks/fixturenet-laconicd/stack.yml

@@ -2,9 +2,9 @@ version: "1.0"
 name: fixturenet-laconicd
 description: "A laconicd fixturenet"
 repos:
-  - cerc-io/laconicd
-  - cerc-io/laconic-sdk
-  - cerc-io/laconic-registry-cli
+  - github.com/cerc-io/laconicd
+  - github.com/cerc-io/laconic-sdk
+  - github.com/cerc-io/laconic-registry-cli
 npms:
   - laconic-sdk
   - laconic-registry-cli

app/data/stacks/fixturenet-lotus/stack.yml

@@ -2,7 +2,7 @@ version: "1.0"
 name: fixturenet-lotus
 description: "A lotus fixturenet"
 repos:
-  - filecoin-project/lotus
+  - github.com/filecoin-project/lotus
 containers:
   - cerc/lotus
 pods:

app/data/stacks/fixturenet-optimism/l2-only.md

@@ -9,7 +9,7 @@ Prerequisite: An L1 Ethereum RPC endpoint
 Clone required repositories:
 
 ```bash
-laconic-so --stack fixturenet-optimism setup-repositories --exclude cerc-io/go-ethereum
+laconic-so --stack fixturenet-optimism setup-repositories --exclude github.com/cerc-io/go-ethereum
 
 # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned below and re-run the command
 ```

app/data/stacks/fixturenet-optimism/stack.yml

@@ -2,10 +2,10 @@ version: "1.0"
 name: fixturenet-optimism
 decription: "Optimism Fixturenet"
 repos:
-  - cerc-io/go-ethereum
-  - dboreham/foundry
-  - ethereum-optimism/optimism
-  - ethereum-optimism/op-geth
+  - github.com/cerc-io/go-ethereum
+  - github.com/dboreham/foundry
+  - github.com/ethereum-optimism/optimism
+  - github.com/ethereum-optimism/op-geth
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse

app/data/stacks/fixturenet-pocket/stack.yml

@@ -2,9 +2,9 @@ version: "1.0"
 name: fixturenet-pocket
 description: "A single node pocket chain that can serve relays from the geth-1 node in eth-fixturenet"
 repos:
-  - cerc-io/go-ethereum
-  - pokt-network/pocket-core
-  - pokt-network/pocket-core-deployments # contains the dockerfile
+  - github.com/cerc-io/go-ethereum
+  - github.com/pokt-network/pocket-core
+  - github.com/pokt-network/pocket-core-deployments # contains the dockerfile
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse

app/data/stacks/gelato/stack.yml

@@ -1,7 +1,7 @@
 version: "1.0"
 name: gelato
 repos:
-  - cerc-io/gelato-watcher-ts
+  - github.com/cerc-io/gelato-watcher-ts
 containers:
   - cerc/watcher-gelato
 pods:

app/data/stacks/mobymask-v2/mobymask-only.md

@@ -9,7 +9,7 @@ Prerequisite: L2 Optimism Geth and Node RPC endpoints
 Clone required repositories:
 
 ```bash
-laconic-so --stack mobymask-v2 setup-repositories --include cerc-io/MobyMask,cerc-io/watcher-ts,cerc-io/mobymask-v2-watcher-ts
+laconic-so --stack mobymask-v2 setup-repositories --include github.com/cerc-io/MobyMask,github.com/cerc-io/watcher-ts,github.com/cerc-io/mobymask-v2-watcher-ts
 
 # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned below and re-run the command
 ```

app/data/stacks/mobymask-v2/stack.yml

@@ -1,13 +1,13 @@
 version: "1.0"
 name: mobymask-v2
 repos:
-  - cerc-io/go-ethereum
-  - dboreham/foundry
-  - ethereum-optimism/optimism
-  - ethereum-optimism/op-geth
-  - cerc-io/watcher-ts
-  - cerc-io/mobymask-v2-watcher-ts
-  - cerc-io/MobyMask
+  - github.com/cerc-io/go-ethereum
+  - github.com/dboreham/foundry
+  - github.com/ethereum-optimism/optimism
+  - github.com/ethereum-optimism/op-geth
+  - github.com/cerc-io/watcher-ts
+  - github.com/cerc-io/mobymask-v2-watcher-ts
+  - github.com/cerc-io/MobyMask
 containers:
   - cerc/go-ethereum
   - cerc/lighthouse

app/data/stacks/mobymask-v2/watcher-p2p-network/watcher.md

@@ -14,7 +14,7 @@ This demo has been tested on a `Ubuntu 22.04 LTS` machine with `8GB` of RAM
 Clone required repositories:
 
   ```bash
-  laconic-so --stack mobymask-v2 setup-repositories --include cerc-io/MobyMask,cerc-io/watcher-ts,cerc-io/mobymask-v2-watcher-ts
+  laconic-so --stack mobymask-v2 setup-repositories --include github.com/cerc-io/MobyMask,github.com/cerc-io/watcher-ts,github.com/cerc-io/mobymask-v2-watcher-ts
 
   # This will clone the required repositories at ~/cerc
   # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned in the next step and re-run the command

app/data/stacks/mobymask/README.md

@@ -11,7 +11,7 @@ This deployment expects that ipld-eth-server's endpoints are available on the lo
 ## Clone required repositories
 
 ```
-$ laconic-so setup-repositories --include cerc-io/watcher-ts
+$ laconic-so setup-repositories --include github.com/cerc-io/watcher-ts
 ```
 
 ## Build the watcher container

app/data/stacks/mobymask/stack.yml

@@ -1,7 +1,7 @@
 version: "1.0"
 name: mobymask-watcher
 repos:
-  - cerc-io/watcher-ts/v0.2.19
+  - github.com/cerc-io/watcher-ts/v0.2.19
 containers:
   - cerc/watcher-mobymask
 pods:

app/data/stacks/package-registry/stack.yml

@@ -2,8 +2,8 @@ version: "1.1"
 name: package-registry
 decription: "Local Package Registry"
 repos:
-  - cerc-io/hosting
-  - telackey/act_runner
+  - github.com/cerc-io/hosting
+  - gitea.com/gitea/act_runner
 containers:
   - cerc/act-runner
   - cerc/act-runner-task-executor

app/data/stacks/test/stack.yml

@@ -2,7 +2,8 @@ version: "1.0"
 name: test
 description: "A test stack"
 repos:
-  - cerc-io/laconicd
+  - github.com/cerc-io/laconicd
+  - git.vdb.to/cerc-io/test-project
 containers:
   - cerc/test-container
 pods:

app/data/stacks/uniswap-v3/stack.yml

@@ -1,8 +1,8 @@
 version: "1.0"
 name: uniswap-v3
 repos:
-  - vulcanize/uniswap-watcher-ts
-  - vulcanize/uniswap-v3-info
+  - github.com/vulcanize/uniswap-watcher-ts
+  - github.com/vulcanize/uniswap-v3-info
 containers:
   - cerc/watcher-uniswap-v3
   - cerc/uniswap-v3-info

app/deploy_system.py

@@ -67,15 +67,15 @@ def up(ctx, extra_args):
         if global_context.verbose:
             print(f"Running compose up with container_exec_env: {container_exec_env}, extra_args: {extra_args_list}")
         for pre_start_command in cluster_context.pre_start_commands:
-            _run_command(ctx.obj, cluster_context.cluster, pre_start_command)
+            _run_command(global_context, cluster_context.cluster, pre_start_command)
         ctx.obj.docker.compose.up(detach=True, services=extra_args_list)
         for post_start_command in cluster_context.post_start_commands:
-            _run_command(ctx.obj, cluster_context.cluster, post_start_command)
-        _orchestrate_cluster_config(ctx.obj, cluster_context.config, ctx.obj.docker, container_exec_env)
+            _run_command(global_context, cluster_context.cluster, post_start_command)
+        _orchestrate_cluster_config(global_context, cluster_context.config, ctx.obj.docker, container_exec_env)
 
 
 @command.command()
-@click.option("--delete-volumes", default=False, help="delete data volumes")
+@click.option("--delete-volumes/--preserve-volumes", default=False, help="delete data volumes")
 @click.argument('extra_args', nargs=-1)  # help: command: down<service1> <service2>
 @click.pass_context
 def down(ctx, delete_volumes, extra_args):
@@ -88,7 +88,7 @@ def down(ctx, delete_volumes, extra_args):
         if extra_args_list:
             timeout_arg = extra_args_list[0]
         # Specify shutdown timeout (default 10s) to give services enough time to shutdown gracefully
-        ctx.obj.docker.compose.down(timeout=timeout_arg)
+        ctx.obj.docker.compose.down(timeout=timeout_arg, volumes=delete_volumes)
 
 
 @command.command()
@@ -130,7 +130,7 @@ def port(ctx, extra_args):
             sys.exit(1)
         service_name = extra_args_list[0]
         exposed_port = extra_args_list[1]
-        if ctx.parent.obj.verbose:
+        if global_context.verbose:
             print(f"Running compose port {service_name} {exposed_port}")
         mapped_port_data = ctx.obj.docker.compose.port(service_name, exposed_port)
         print(f"{mapped_port_data[0]}:{mapped_port_data[1]}")

app/setup_repositories.py

@@ -125,11 +125,22 @@ def command(ctx, include, exclude, git_ssh, check_only, pull, branches_file):
             if verbose:
                 print(f"Excluding: {repo}")
 
-    def process_repo(repo):
-        git_ssh_prefix = "git@github.com:"
-        git_http_prefix = "https://github.com/"
-        full_github_repo_path = f"{git_ssh_prefix if git_ssh else git_http_prefix}{repo}"
-        repoName = repo.split("/")[-1]
+    def host_and_path_for_repo(fully_qualified_repo):
+        repo_split = fully_qualified_repo.split("/")
+        # Legacy unqualified repo means github
+        if len(repo_split) == 2:
+            return "github.com", "/".join(repo_split)
+        else:
+            if len(repo_split) == 3:
+                # First part is the host
+                return repo_split[0], "/".join(repo_split[1:])
+
+    def process_repo(fully_qualified_repo):
+        repo_host, repo_path = host_and_path_for_repo(fully_qualified_repo)
+        git_ssh_prefix = f"git@{repo_host}:"
+        git_http_prefix = f"https://{repo_host}/"
+        full_github_repo_path = f"{git_ssh_prefix if git_ssh else git_http_prefix}{repo_path}"
+        repoName = repo_path.split("/")[-1]
         full_filesystem_repo_path = os.path.join(dev_root_path, repoName)
         is_present = os.path.isdir(full_filesystem_repo_path)
         if not quiet:

cli.py

@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http:#www.gnu.org/licenses/>.
 
 import click
+from dataclasses import dataclass
 
 from app import setup_repositories
 from app import build_containers
@@ -24,17 +25,15 @@ from app import version
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
 
 
-# TODO: this seems kind of weird and heavy on boilerplate -- check it is
-# the best Python can do for us.
-class Options(object):
-    def __init__(self, stack, quiet, verbose, dry_run, local_stack, debug, continue_on_error):
-        self.stack = stack
-        self.quiet = quiet
-        self.verbose = verbose
-        self.dry_run = dry_run
-        self.local_stack = local_stack
-        self.debug = debug
-        self.continue_on_error = continue_on_error
+@dataclass
+class Options:
+    stack: str
+    quiet: bool = False
+    verbose: bool = False
+    dry_run: bool = False
+    local_stack: bool = False
+    debug: bool = False
+    continue_on_error: bool = False
 
 
 @click.group(context_settings=CONTEXT_SETTINGS)

tests/deploy/run-deploy-test.sh

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+set -e
+if [ -n "$CERC_SCRIPT_DEBUG" ]; then
+  set -x
+fi
+# Dump environment variables for debugging
+echo "Environment variables:"
+env
+# Test basic stack-orchestrator deploy
+echo "Running stack-orchestrator deploy test"
+# Bit of a hack, test the most recent package
+TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 )
+# Set a non-default repo dir
+export CERC_REPO_BASE_DIR=~/stack-orchestrator-test/repo-base-dir
+echo "Testing this package: $TEST_TARGET_SO"
+echo "Test version command"
+reported_version_string=$( $TEST_TARGET_SO version )
+echo "Version reported is: ${reported_version_string}"
+echo "Cloning repositories into: $CERC_REPO_BASE_DIR"
+rm -rf $CERC_REPO_BASE_DIR
+mkdir -p $CERC_REPO_BASE_DIR
+# Test bringing the test container up and down
+# with and without volume removal
+$TEST_TARGET_SO --stack test setup-repositories
+$TEST_TARGET_SO --stack test build-containers
+$TEST_TARGET_SO --stack test deploy up
+# Test deploy port command
+deploy_port_output=$( $TEST_TARGET_SO --stack test deploy port test 80 )
+if [[ "$deploy_port_output" =~ ^0.0.0.0:[1-9][0-9]* ]]; then
+    echo "Deploy port test: passed"
+else
+    echo "Deploy port test: FAILED"
+    exit 1
+fi
+$TEST_TARGET_SO --stack test deploy down
+# The next time we bring the container up the volume will be old (from the previous run above)
+$TEST_TARGET_SO --stack test deploy up
+log_output_1=$( $TEST_TARGET_SO --stack test deploy logs )
+if [[ "$log_output_1" == *"Filesystem is old"* ]]; then
+    echo "Retain volumes test: passed"
+else
+    echo "Retain volumes test: FAILED"
+    exit 1
+fi
+$TEST_TARGET_SO --stack test deploy down --delete-volumes
+# Now when we bring the container up the volume will be new again
+$TEST_TARGET_SO --stack test deploy up
+log_output_2=$( $TEST_TARGET_SO --stack test deploy logs )
+if [[ "$log_output_2" == *"Filesystem is fresh"* ]]; then
+    echo "Delete volumes test: passed"
+else
+    echo "Delete volumes test: FAILED"
+    exit 1
+fi
+$TEST_TARGET_SO --stack test deploy down --delete-volumes
+echo "Test passed"