simplify api compare test

ChainSafe · May 10, 2024 · 18ee61e · 18ee61e
1 parent c92ef74
commit 18ee61e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 32 deletions.
diff --git a/.github/workflows/forest.yml b/.github/workflows/forest.yml
@@ -376,20 +376,6 @@ jobs:
       # We use a custom Dockerfile for CI to speed up the build process.
       FOREST_DOCKERFILE_OVERRIDE: scripts/devnet/forest_ci.dockerfile
     steps:
-      - uses: actions/cache@v4
-        id: cache
-        with:
-          path: '${{ env.FIL_PROOFS_PARAMETER_CACHE }}'
-          key: proof-params-keys
-      - name: Load cache into volume
-        if: steps.cache.outputs.cache-hit == 'true'
-        run: |
-          docker volume create api_compare_filecoin-proofs
-          docker run --rm \
-            -v api_compare_filecoin-proofs:/proofs \
-            -v $FIL_PROOFS_PARAMETER_CACHE:/cache \
-            $SHELL_IMAGE \
-            sh -c "cp /cache/* /proofs"
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
@@ -400,15 +386,6 @@ jobs:
       - name: Dump docker logs
         if: always()
         uses: jwalton/gh-docker-logs@v2
-      - name: Prepare cache folder for uploading
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          docker run --rm \
-            -v api_compare_filecoin-proofs:/proofs \
-            -v $FIL_PROOFS_PARAMETER_CACHE:/cache \
-            $SHELL_IMAGE \
-            sh -c "cp /proofs/* /cache"
-          sudo chmod -R 755 $FIL_PROOFS_PARAMETER_CACHE
   snapshot-parity-checks:
     needs:
       - build-ubuntu

diff --git a/scripts/tests/api_compare/aria2-Dockerfile b/scripts/tests/api_compare/aria2-Dockerfile
diff --git a/scripts/tests/api_compare/docker-compose.yml b/scripts/tests/api_compare/docker-compose.yml
@@ -3,9 +3,11 @@
 services:
   init: 
     build:
-      dockerfile: aria2-Dockerfile
+      context: ../../../.
+      dockerfile: ${FOREST_DOCKERFILE_OVERRIDE:-Dockerfile}
     volumes:
       - node-data:/data
+      - filecoin-proofs:${FIL_PROOFS_PARAMETER_CACHE}
     networks:
       - api-tests
     environment:
@@ -14,11 +16,13 @@ services:
     command:
       - |
         set -euxo pipefail
+        # fetch parameter files
+        forest-tool fetch-params --keys
         # if there are some files in the data directory, then we don't need to fetch the snapshot
         if [ "$$(ls -A /data/*.car.zst)" ]; then
           echo "Snapshot already fetched"
         else
-          aria2c -d /data -x5 https://forest-archive.chainsafe.dev/latest/calibnet/
+          forest-tool snapshot fetch --chain calibnet -d /data
         fi
   forest:
     depends_on: