From d04796e3d9f0c5126b307a2b7518ccff80c80225 Mon Sep 17 00:00:00 2001 From: Michelangelo Riccobene Date: Wed, 5 Jun 2024 15:49:15 +0200 Subject: [PATCH] qa-tests: update 2.60.x test workflows from main (#10627) --- .../workflows/qa-clean-exit-block-downloading.yml | 7 ++++--- .../qa-clean-exit-snapshot-downloading.yml | 7 ++++--- .github/workflows/qa-snap-download.yml | 13 +++++++------ .github/workflows/qa-tip-tracking.yml | 10 ++++++---- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.github/workflows/qa-clean-exit-block-downloading.yml b/.github/workflows/qa-clean-exit-block-downloading.yml index 94685698232..c76d4e834a4 100644 --- a/.github/workflows/qa-clean-exit-block-downloading.yml +++ b/.github/workflows/qa-clean-exit-block-downloading.yml @@ -12,13 +12,14 @@ on: workflow_dispatch: # Run manually jobs: - long-running-test: + clean-exit-bd-test: runs-on: [self-hosted, Erigon2] env: ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir ERIGON_QA_PATH: /home/qarunner/erigon-qa WORKING_TIME_SECONDS: 600 + CHAIN: mainnet steps: - name: Check out repository @@ -47,7 +48,7 @@ jobs: set +e # Disable exit on error # Run Erigon, send ctrl-c and check logs - python3 $ERIGON_QA_PATH/test_system/qa-tests/clean-exit/run_and_check_clean_exit.py ${{ github.workspace }}/build/bin $ERIGON_TESTBED_DATA_DIR $WORKING_TIME_SECONDS + python3 $ERIGON_QA_PATH/test_system/qa-tests/clean-exit/run_and_check_clean_exit.py ${{ github.workspace }}/build/bin $ERIGON_TESTBED_DATA_DIR $WORKING_TIME_SECONDS Erigon2 # Capture monitoring script exit status test_exit_status=$? @@ -84,7 +85,7 @@ jobs: if: steps.test_step.outputs.test_executed == 'true' env: TEST_RESULT: ${{ steps.test_step.outputs.TEST_RESULT }} - run: python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py --repo erigon --commit $(git rev-parse HEAD) --test_name clean-exit-block-downloading --outcome $TEST_RESULT --result_file ${{ github.workspace }}/result.json + run: python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py --repo erigon --commit $(git rev-parse HEAD) --branch ${{ github.ref_name }} --test_name clean-exit-block-downloading --chain $CHAIN --outcome $TEST_RESULT --result_file ${{ github.workspace }}/result.json - name: Upload test results if: steps.test_step.outputs.test_executed == 'true' diff --git a/.github/workflows/qa-clean-exit-snapshot-downloading.yml b/.github/workflows/qa-clean-exit-snapshot-downloading.yml index ea9bedc6e46..4af04a97777 100644 --- a/.github/workflows/qa-clean-exit-snapshot-downloading.yml +++ b/.github/workflows/qa-clean-exit-snapshot-downloading.yml @@ -12,12 +12,13 @@ on: workflow_dispatch: # Run manually jobs: - long-running-test: + clean-exit-sd-test: runs-on: self-hosted env: ERIGON_DATA_DIR: ${{ github.workspace }}/erigon_data ERIGON_QA_PATH: /home/qarunner/erigon-qa WORKING_TIME_SECONDS: 600 + CHAIN: mainnet steps: - name: Check out repository @@ -43,7 +44,7 @@ jobs: set +e # Disable exit on error # Run Erigon, send ctrl-c and check logs - python3 $ERIGON_QA_PATH/test_system/qa-tests/clean-exit/run_and_check_clean_exit.py ${{ github.workspace }}/build/bin $ERIGON_DATA_DIR $WORKING_TIME_SECONDS + python3 $ERIGON_QA_PATH/test_system/qa-tests/clean-exit/run_and_check_clean_exit.py ${{ github.workspace }}/build/bin $ERIGON_DATA_DIR $WORKING_TIME_SECONDS Erigon2 # Capture monitoring script exit status test_exit_status=$? @@ -80,7 +81,7 @@ jobs: if: steps.test_step.outputs.test_executed == 'true' env: TEST_RESULT: ${{ steps.test_step.outputs.TEST_RESULT }} - run: python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py --repo erigon --commit $(git rev-parse HEAD) --test_name clean-exit-snapshot-downloading --outcome $TEST_RESULT --result_file ${{ github.workspace }}/result.json + run: python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py --repo erigon --commit $(git rev-parse HEAD) --branch ${{ github.ref_name }} --test_name clean-exit-snapshot-downloading --chain $CHAIN --outcome $TEST_RESULT --result_file ${{ github.workspace }}/result.json - name: Upload test results if: steps.test_step.outputs.test_executed == 'true' diff --git a/.github/workflows/qa-snap-download.yml b/.github/workflows/qa-snap-download.yml index 900ad209a95..b6fe19ee291 100644 --- a/.github/workflows/qa-snap-download.yml +++ b/.github/workflows/qa-snap-download.yml @@ -12,13 +12,14 @@ on: workflow_dispatch: # Run manually jobs: - long-running-test: + snap-download-test: runs-on: [self-hosted, Erigon2] + timeout-minutes: 800 env: ERIGON_DATA_DIR: ${{ github.workspace }}/erigon_data ERIGON_QA_PATH: /home/qarunner/erigon-qa - TRACKING_TIME_SECONDS: 14400 # 4 hours - TOTAL_TIME_SECONDS: 28800 # 8 hours + TOTAL_TIME_SECONDS: 43200 # 12 hours + CHAIN: mainnet steps: - name: Check out repository @@ -44,7 +45,7 @@ jobs: set +e # Disable exit on error # Run Erigon, monitor snapshot downloading and check logs - python3 $ERIGON_QA_PATH/test_system/qa-tests/snap-download/run_and_check_snap_download.py ${{ github.workspace }}/build/bin $ERIGON_DATA_DIR $TOTAL_TIME_SECONDS + python3 $ERIGON_QA_PATH/test_system/qa-tests/snap-download/run_and_check_snap_download.py ${{ github.workspace }}/build/bin $ERIGON_DATA_DIR $TOTAL_TIME_SECONDS Erigon2 $CHAIN # Capture monitoring script exit status test_exit_status=$? @@ -81,14 +82,14 @@ jobs: if: steps.test_step.outputs.test_executed == 'true' env: TEST_RESULT: ${{ steps.test_step.outputs.TEST_RESULT }} - run: python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py --repo erigon --commit $(git rev-parse HEAD) --test_name snap-download --outcome $TEST_RESULT --result_file ${{ github.workspace }}/result.json + run: python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py --repo erigon --commit $(git rev-parse HEAD) --branch ${{ github.ref_name }} --test_name snap-download --chain $CHAIN --outcome $TEST_RESULT --result_file ${{ github.workspace }}/result-$CHAIN.json - name: Upload test results if: steps.test_step.outputs.test_executed == 'true' uses: actions/upload-artifact@v4 with: name: test-results - path: ${{ github.workspace }}/result.json + path: ${{ github.workspace }}/result-${{ env.CHAIN }}.json - name: Action for Success if: steps.test_step.outputs.TEST_RESULT == 'success' diff --git a/.github/workflows/qa-tip-tracking.yml b/.github/workflows/qa-tip-tracking.yml index 99043261bfb..5f24be05dbb 100644 --- a/.github/workflows/qa-tip-tracking.yml +++ b/.github/workflows/qa-tip-tracking.yml @@ -12,14 +12,16 @@ on: workflow_dispatch: # Run manually jobs: - long-running-test: + tip-tracking-test: runs-on: [self-hosted, Erigon2] + timeout-minutes: 600 env: ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir ERIGON_QA_PATH: /home/qarunner/erigon-qa TRACKING_TIME_SECONDS: 14400 # 4 hours TOTAL_TIME_SECONDS: 28800 # 8 hours + CHAIN: mainnet steps: - name: Check out repository @@ -50,7 +52,7 @@ jobs: # 1. Launch the testbed Erigon instance # 2. Allow time for the Erigon to achieve synchronization # 3. Begin timing the duration that Erigon maintains synchronization - python3 $ERIGON_QA_PATH/test_system/qa-tests/tip-tracking/run_and_check_tip_tracking.py ${{ github.workspace }}/build/bin $ERIGON_TESTBED_DATA_DIR $TRACKING_TIME_SECONDS $TOTAL_TIME_SECONDS + python3 $ERIGON_QA_PATH/test_system/qa-tests/tip-tracking/run_and_check_tip_tracking.py ${{ github.workspace }}/build/bin $ERIGON_TESTBED_DATA_DIR $TRACKING_TIME_SECONDS $TOTAL_TIME_SECONDS Erigon2 $CHAIN # Capture monitoring script exit status test_exit_status=$? @@ -87,14 +89,14 @@ jobs: if: steps.test_step.outputs.test_executed == 'true' env: TEST_RESULT: ${{ steps.test_step.outputs.TEST_RESULT }} - run: python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py --repo erigon --commit $(git rev-parse HEAD) --test_name tip-tracking --outcome $TEST_RESULT --result_file ${{ github.workspace }}/result.json + run: python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py --repo erigon --commit $(git rev-parse HEAD) --branch ${{ github.ref_name }} --test_name tip-tracking --chain $CHAIN --outcome $TEST_RESULT --result_file ${{ github.workspace }}/result-$CHAIN.json - name: Upload test results if: steps.test_step.outputs.test_executed == 'true' uses: actions/upload-artifact@v4 with: name: test-results - path: ${{ github.workspace }}/result.json + path: ${{ github.workspace }}/result-${{ env.CHAIN }}.json - name: Action for Success if: steps.test_step.outputs.TEST_RESULT == 'success'