From f8de0defadaa12ae22163be43fbf66ceea6f0d0b Mon Sep 17 00:00:00 2001 From: Abdul Rabbani Date: Fri, 17 Jun 2022 11:37:50 -0400 Subject: [PATCH] RE-test release with correct commit hash --- .github/workflows/on-pr-publish.yaml | 4 ++++ .github/workflows/run_unit_test.sh | 2 +- .github/workflows/tests.yaml | 36 +++++++++++++--------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/on-pr-publish.yaml b/.github/workflows/on-pr-publish.yaml index b1e28a79..9834c6ff 100644 --- a/.github/workflows/on-pr-publish.yaml +++ b/.github/workflows/on-pr-publish.yaml @@ -27,6 +27,10 @@ jobs: BUILD_HOSTNAME: ${{ secrets.BUILD_HOSTNAME }} BUILD_USERNAME: ${{ secrets.BUILD_USERNAME }} BUILD_KEY: ${{ secrets.BUILD_KEY }} + with: + STACK_ORCHESTRATOR_REF: "382aca8e42bc5e33f301f77cdd2e09cc80602fc3" + GO_ETHEREUM_REF: "d629c99d84cb8d20b89e46c1d9f852c7409829f2" + IPLD_ETH_DB_REF: "48eb594ea95763bda8e51590f105f7a2657ac6d4" build: name: Run docker build runs-on: ubuntu-latest diff --git a/.github/workflows/run_unit_test.sh b/.github/workflows/run_unit_test.sh index d1854407..73b24c81 100755 --- a/.github/workflows/run_unit_test.sh +++ b/.github/workflows/run_unit_test.sh @@ -17,7 +17,7 @@ rm -f /tmp/git_head_ref /tmp/git_repository rm -rf out/docker-tsdb/ # Copy over files to setup TimescaleDB -ID=$(docker create vulcanize/ipld-eth-db:v4.1.1-alpha) +ID=$(docker create vulcanize/ipld-eth-db:v4.1.3-alpha) docker cp $ID:/app/docker-tsdb out/docker-tsdb/ docker rm -v $ID diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 16cf13cb..1597a55e 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -8,6 +8,16 @@ on: required: true BUILD_KEY: required: true + inputs: + STACK_ORCHESTRATOR_REF: + required: true + type: string + GO_ETHEREUM_REF: + required: true + type: string + IPLD_ETH_DB_REF: + required: true + type: string jobs: build: @@ -68,9 +78,6 @@ jobs: integrationtest: name: Run integration tests env: - STACK_ORCHESTRATOR_REF: 418957a1f745c921b21286c13bb033f922a91ae9 - GO_ETHEREUM_REF: "v1.10.18-statediff-4.0.2-alpha" - IPLD_ETH_DB_REF: 91d30b9ea1acecd0a7f4307390a98bf3e289b8d7 GOPATH: /tmp/go DB_WRITE: true ETH_FORWARD_ETH_CALLS: false @@ -89,12 +96,12 @@ jobs: path: "./ipld-eth-server" - uses: actions/checkout@v2 with: - ref: ${{ env.STACK_ORCHESTRATOR_REF }} + ref: ${{ inputs.STACK_ORCHESTRATOR_REF }} path: "./stack-orchestrator/" repository: vulcanize/stack-orchestrator - uses: actions/checkout@v2 with: - ref: ${{ env.GO_ETHEREUM_REF }} + ref: ${{ inputs.GO_ETHEREUM_REF }} repository: vulcanize/go-ethereum path: "./go-ethereum/" - uses: actions/checkout@v2 @@ -112,9 +119,6 @@ jobs: echo eth_forward_eth_calls=$ETH_FORWARD_ETH_CALLS >> ./config.sh echo eth_proxy_on_error=$ETH_PROXY_ON_ERROR >> ./config.sh echo eth_http_path=$ETH_HTTP_PATH >> ./config.sh - echo ipld_eth_server_db_dependency=access-node >> ./config.sh - echo go_ethereum_db_dependency=access-node >> ./config.sh - echo connecting_db_name=vulcanize_testing_v4 >> ./config.sh echo watched_address_gap_filler_enabled=false >> ./config.sh echo watched_address_gap_filler_interval=5 >> ./config.sh cat ./config.sh @@ -127,11 +131,10 @@ jobs: - name: Run docker compose run: | docker-compose \ - -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-migration.yml" \ + -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" \ -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" \ -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-ipld-eth-server.yml" \ -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-contract.yml" \ - -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/latest/docker-compose-timescale-db.yml" \ --env-file "$GITHUB_WORKSPACE/config.sh" \ up -d --build - name: Test @@ -144,9 +147,6 @@ jobs: integrationtest_forwardethcalls: name: Run integration tests for direct proxy fall-through of eth_calls env: - STACK_ORCHESTRATOR_REF: 418957a1f745c921b21286c13bb033f922a91ae9 - GO_ETHEREUM_REF: "v1.10.18-statediff-4.0.2-alpha" - IPLD_ETH_DB_REF: 91d30b9ea1acecd0a7f4307390a98bf3e289b8d7 GOPATH: /tmp/go DB_WRITE: false ETH_FORWARD_ETH_CALLS: true @@ -165,12 +165,12 @@ jobs: path: "./ipld-eth-server" - uses: actions/checkout@v2 with: - ref: ${{ env.STACK_ORCHESTRATOR_REF }} + ref: ${{ inputs.STACK_ORCHESTRATOR_REF }} path: "./stack-orchestrator/" repository: vulcanize/stack-orchestrator - uses: actions/checkout@v2 with: - ref: ${{ env.GO_ETHEREUM_REF }} + ref: ${{ inputs.GO_ETHEREUM_REF }} repository: vulcanize/go-ethereum path: "./go-ethereum/" - uses: actions/checkout@v2 @@ -188,9 +188,6 @@ jobs: echo eth_forward_eth_calls=$ETH_FORWARD_ETH_CALLS >> ./config.sh echo eth_proxy_on_error=$ETH_PROXY_ON_ERROR >> ./config.sh echo eth_http_path=$ETH_HTTP_PATH >> ./config.sh - echo ipld_eth_server_db_dependency=access-node >> ./config.sh - echo go_ethereum_db_dependency=access-node >> ./config.sh - echo connecting_db_name=vulcanize_testing_v4 >> ./config.sh echo watched_address_gap_filler_enabled=false >> ./config.sh echo watched_address_gap_filler_interval=5 >> ./config.sh cat ./config.sh @@ -203,11 +200,10 @@ jobs: - name: Run docker compose run: | docker-compose \ - -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-migration.yml" \ + -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" \ -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" \ -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-ipld-eth-server.yml" \ -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-contract.yml" \ - -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/latest/docker-compose-timescale-db.yml" \ --env-file "$GITHUB_WORKSPACE/config.sh" \ up -d --build - name: Test