diff --git a/.github/workflows/run-docker-tests.yml b/.github/workflows/run-docker-tests.yml index 6c0e688ce..52131ab36 100644 --- a/.github/workflows/run-docker-tests.yml +++ b/.github/workflows/run-docker-tests.yml @@ -32,15 +32,38 @@ jobs: run: docker pull ${{ inputs.image_url || env.default_image }} - name: run the Docker tests - run: docker compose up ${{ env.container_name }} + run: docker compose up ${{ env.container_name }}-test1 -e TESTS="/app/src/lib/provable/test/merkle-list.test.ts" + # /app/src/lib/provable/test/merkle-tree.test.ts /app/src/lib/provable/test/scalar.test.ts /app/src/lib/provable/test/merkle-map.test.ts /app/src/lib/provable/test/provable.test.ts /app/src/lib/provable/test/primitives.test.ts /app/src/lib/provable/test/group.test.ts /app/src/lib/provable/test/int.test.ts /app/src/lib/mina/precondition.test.ts" env: - DOCKER_IMAGE_URL: ${{ inputs.image_url || env.default_image}} - + DOCKER_IMAGE_URL: ${{ inputs.image_url || env.default_image}} - name: docker cp results run: docker compose cp ${{ env.container_name }}:/tmp/perf.data.tar.gz perf.data.tar.gz - - name: Archive results uses: meta-introspector/upload-artifact@v4 with: name: perf.data.tar.gz path: perf.data.tar.gz + - name: delete the results + run: rm -rf /tmp/perf* + - name: delete the container + run: | + docker-compose down + docker rm -f $(docker ps -a -q) + docker volume rm $(docker volume ls -q) + + + - name: run the Docker tests part 2 + run: docker compose up ${{ env.container_name }}-test2 + env: + DOCKER_IMAGE_URL: ${{ inputs.image_url || env.default_image}} + + - name: docker cp results + run: docker compose cp ${{ env.container_name }}:/tmp/perf.data.tar.gz perf.data2.tar.gz + - name: Archive results + uses: meta-introspector/upload-artifact@v4 + with: + name: perf.data2.tar.gz + path: perf.data2.tar.gz + + + diff --git a/docker-compose.yml b/docker-compose.yml index a3f2601e8..3f5a2a4cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,21 +23,20 @@ services: environment: - PROOF_LEVEL=full - LOG_LEVEL=Debug - working_dir: /app - +# - TESTS=${TESTS} + working_dir: /app # mount the source volumes: - type: bind source: "/home/runner/work/o1js/o1js/" target: "/opt/introspector/test/" - cap_add: - SYS_PTRACE - SYS_ADMIN - # run the test from the mounted source command: "bash -x /opt/introspector/test/run-all-tests.sh" + reporting: restart: no image: ghcr.io/meta-introspector/o1js/o1js-perf-reporting:latest diff --git a/run-all-tests.sh b/run-all-tests.sh index 249416ec2..0f7b076dc 100755 --- a/run-all-tests.sh +++ b/run-all-tests.sh @@ -22,7 +22,7 @@ pnpm install -g clinic cd /app/ export SOURCE_DIR=/app/src # limit to only working tests -TESTS="${SOURCE_DIR}/lib/provable/test/merkle-list.test.ts ${SOURCE_DIR}/lib/provable/test/merkle-tree.test.ts ${SOURCE_DIR}/lib/provable/test/scalar.test.ts ${SOURCE_DIR}/lib/provable/test/merkle-map.test.ts ${SOURCE_DIR}/lib/provable/test/provable.test.ts ${SOURCE_DIR}/lib/provable/test/primitives.test.ts ${SOURCE_DIR}/lib/provable/test/group.test.ts ${SOURCE_DIR}/lib/provable/test/int.test.ts ${SOURCE_DIR}/lib/mina/precondition.test.ts" +#TESTS="${SOURCE_DIR}/lib/provable/test/merkle-list.test.ts ${SOURCE_DIR}/lib/provable/test/merkle-tree.test.ts ${SOURCE_DIR}/lib/provable/test/scalar.test.ts ${SOURCE_DIR}/lib/provable/test/merkle-map.test.ts ${SOURCE_DIR}/lib/provable/test/provable.test.ts ${SOURCE_DIR}/lib/provable/test/primitives.test.ts ${SOURCE_DIR}/lib/provable/test/group.test.ts ${SOURCE_DIR}/lib/provable/test/int.test.ts ${SOURCE_DIR}/lib/mina/precondition.test.ts" #${SOURCE_DIR}/lib/mina/token.test.ts" # FIXME this all tests is not used because many of them fail. ALL_TESTS=`ls -b ${SOURCE_DIR}/lib/provable/test/*.test.ts ${SOURCE_DIR}/lib/mina/*.test.ts `