diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index dd462e96..91b96d6a 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@v3 with: repository: cerc-io/stack-orchestrator - ref: roy/for-ci + ref: roy/ipld-eth-ci path: ./stack-orchestrator - run: pip install ./stack-orchestrator - name: "Run testnet stack" @@ -68,7 +68,7 @@ jobs: uses: actions/checkout@v3 with: repository: cerc-io/stack-orchestrator - ref: roy/for-ci + ref: roy/ipld-eth-ci path: ./stack-orchestrator - run: pip install ./stack-orchestrator - name: "Run testnet stack" diff --git a/scripts/integration-setup.sh b/scripts/integration-setup.sh index 6857372a..d0d2d181 100755 --- a/scripts/integration-setup.sh +++ b/scripts/integration-setup.sh @@ -6,22 +6,23 @@ export DOCKER_BUILDKIT=1 # Prevent conflicting tty output export BUILDKIT_PROGRESS=plain -# By default assume we are running in the project root -export CERC_REPO_BASE_DIR="${CERC_REPO_BASE_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:-..}" +# v5 migrations only go up to version 18 +echo CERC_STATEDIFF_DB_GOOSE_MIN_VER=18 >> $CONFIG_DIR/stack.env # Pass this in so we can run eth_call forwarding tests, which expect no IPLD DB -echo "CERC_RUN_STATEDIFF=${CERC_RUN_STATEDIFF:-true}" >> $CONFIG_DIR/stack.env +echo CERC_RUN_STATEDIFF=${CERC_RUN_STATEDIFF:-true} >> $CONFIG_DIR/stack.env -laconic_so="${LACONIC_SO:-laconic-so} --verbose --stack fixturenet-eth-loaded" +laconic_so="${LACONIC_SO:-laconic-so} --stack fixturenet-eth-loaded --quiet" set -x # Build and deploy a cluster with only what we need from the stack $laconic_so setup-repositories \ - --exclude cerc-io/ipld-eth-server,cerc-io/tx-spammer \ - --branches-file ./test/stack-refs.yml + --exclude github.com/cerc-io/ipld-eth-server,github.com/cerc-io/tx-spammer \ + --branches-file ./test/stack-refs.txt $laconic_so build-containers \ --exclude cerc/ipld-eth-server,cerc/keycloak,cerc/tx-spammer diff --git a/test/stack-refs.txt b/test/stack-refs.txt new file mode 100644 index 00000000..b0eedb5e --- /dev/null +++ b/test/stack-refs.txt @@ -0,0 +1,2 @@ +github.com/cerc-io/go-ethereum v1.11.5-statediff-5.0.5-alpha +github.com/cerc-io/ipld-eth-db v5.0.2-alpha diff --git a/test/stack-refs.yml b/test/stack-refs.yml deleted file mode 100644 index f3220ee2..00000000 --- a/test/stack-refs.yml +++ /dev/null @@ -1,3 +0,0 @@ -repos: - - github.com/cerc-io/go-ethereum v1.11.5-statediff-5.0.5-alpha - - github.com/cerc-io/ipld-eth-db v5.0.2-alpha