update tests

.github/workflows/tests.yaml

@@ -12,9 +12,7 @@ on:
       - ci-test
 
 env:
-  # Needed until we can incorporate docker startup into the executor container
+  SO_VERSION: v1.1.0-87fffca-202404110321
-  DOCKER_HOST: unix:///var/run/dind.sock
-  SO_VERSION: v1.1.0-e0b5318-202309201927   # contains fixes for plugeth stack
 
 jobs:
   test:
@@ -26,17 +24,8 @@ jobs:
         with:
           go-version-file: 'go.mod'
           check-latest: true
-      - name: Run dockerd
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
       - name: Run DB container
         run: docker compose -f test/compose-db.yml up --wait --quiet-pull
-      - name: Configure Gitea access
-        env:
-          TOKEN: ${{ secrets.CICD_REPO_TOKEN }}
-        run: |
-          git config --global url."https://$TOKEN:@git.vdb.to/".insteadOf https://git.vdb.to/
       - name: Build and run tests
         run: |
           go install github.com/onsi/ginkgo/v2/ginkgo
@@ -51,10 +40,6 @@ jobs:
         with:
           go-version-file: 'go.mod'
           check-latest: true
-      - name: Run dockerd
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
 
       - name: Build server image
         env:
@@ -75,11 +60,6 @@ jobs:
           ref: ${{ env.SO_VERSION }}
           path: ./stack-orchestrator
       - run: pip install ./stack-orchestrator
-      - name: Configure Gitea access
-        env:
-          TOKEN: ${{ secrets.CICD_REPO_TOKEN }}
-        run: |
-          git config --global url."https://$TOKEN:@git.vdb.to/".insteadOf https://git.vdb.to/
 
       - name: Run testnet stack
         env:

scripts/integration-setup.sh

@@ -4,30 +4,30 @@
 
 set -e
 
-export DOCKER_BUILDKIT=1
+laconic_so="${LACONIC_SO:-laconic-so} --stack $(readlink -f test) --verbose"
-# Prevent conflicting tty output
-export BUILDKIT_PROGRESS=plain
 
 CONFIG_DIR=$(readlink -f "${CONFIG_DIR:-$(mktemp -d)}")
 
+# 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:-..}"
 # 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
-
+# don't run plugeth in the debugger
-laconic_so="${LACONIC_SO:-laconic-so} --stack fixturenet-plugeth-tx --verbose"
+echo CERC_REMOTE_DEBUG=false >> $CONFIG_DIR/stack.env
 
 set -x
 
 if [[ -z $SKIP_BUILD ]]; then
     $laconic_so setup-repositories \
-        --exclude github.com/cerc-io/ipld-eth-server,github.com/cerc-io/tx-spammer,github.com/dboreham/foundry \
+        --exclude github.com/cerc-io/ipld-eth-server
-        --branches-file ./test/stack-refs.txt
+    # Assume the tested image has been built separately
-
     $laconic_so build-containers \
-        --exclude cerc/ipld-eth-server,cerc/keycloak,cerc/tx-spammer,cerc/foundry
+        --exclude cerc/ipld-eth-server
 fi
 
 $laconic_so deploy \

test/stack-refs.txt

@@ -1,2 +0,0 @@
-git.vdb.to/cerc-io/ipld-eth-db v5.2.0-alpha
-git.vdb.to/cerc-io/plugeth-statediff v0.1.1

test/stack.yml

@@ -0,0 +1,23 @@
+version: "1.2"
+name: fixturenet-plugeth-tx
+description: "Plugeth Ethereum Fixturenet for testing ipld-eth-server"
+repos:
+  - git.vdb.to/cerc-io/plugeth@statediff-patches         # todo: dev
+  - git.vdb.to/cerc-io/plugeth-statediff@update-czkg4844 # todo: dev
+  - git.vdb.to/cerc-io/lighthouse
+  - git.vdb.to/cerc-io/ipld-eth-db@v5.2.1-alpha
+  - git.vdb.to/cerc-io/ipld-eth-server
+containers:
+  - cerc/plugeth-statediff
+  - cerc/plugeth
+  - cerc/fixturenet-eth-genesis
+  - cerc/fixturenet-plugeth-plugeth
+  - cerc/lighthouse
+  - cerc/lighthouse-cli
+  - cerc/fixturenet-eth-lighthouse
+  - cerc/ipld-eth-db
+  - cerc/ipld-eth-server
+pods:
+  - fixturenet-plugeth
+  - ipld-eth-db
+  - ipld-eth-server