From e4c74cd0391a4b48ee3f1e2652cdc9445851f9ec Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Thu, 27 Jun 2024 21:16:59 +0800 Subject: [PATCH] put stack path in script --- .gitea/workflows/test.yml | 3 +-- scripts/run-test-stack.sh | 12 +++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index c295b24..e203eec 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -82,8 +82,7 @@ jobs: progress: false - name: Run testnet stack working-directory: ./plugeth-statediff - run: | - ./scripts/run-test-stack.sh ../fixturenet-eth-stacks/stack-orchestrator/stacks/fixturenet-plugeth + run: ./scripts/run-test-stack.sh - name: Run tests working-directory: ./system-tests run: | diff --git a/scripts/run-test-stack.sh b/scripts/run-test-stack.sh index f67ef16..df2feb1 100755 --- a/scripts/run-test-stack.sh +++ b/scripts/run-test-stack.sh @@ -2,15 +2,15 @@ set -ex -[[ -d "$1" ]] +# Note: stack path should be absolute, otherwise SO looks for it in packaged stacks +stack_dir=$(readlink -f "${1:-../fixturenet-eth-stacks/stack-orchestrator/stacks/fixturenet-plugeth}") + +[[ -d "$stack_dir" ]] CONFIG_DIR=$(readlink -f "${CONFIG_DIR:-$(mktemp -d)}") # By default assume we are running in the project root. export CERC_REPO_BASE_DIR="${CERC_REPO_BASE_DIR:-$(git rev-parse --show-toplevel)/..}" -# Note: stack path should be absolute, otherwise SO looks for it in packaged stacks -stack_dir=$(readlink -f "$1") - laconic_so="laconic-so --verbose --stack $stack_dir" # Don't run geth/plugeth in the debugger, it will swallow error backtraces @@ -22,7 +22,9 @@ if [[ -z $SKIP_BUILD ]]; then --exclude git.vdb.to/cerc-io/plugeth-statediff # Assume the tested image has been built separately $laconic_so build-containers \ - --exclude cerc/plugeth-statediff + --include cerc/fixturenet-eth-genesis-postmerge,cerc/fixturenet-plugeth-plugeth,cerc/fixturenet-eth-lighthouse + # --include cerc/fixturenet-eth-genesis-postmerge + # --exclude cerc/plugeth-statediff fi if ! $laconic_so deploy \