From b8b6d51b874af2cd4ca93f8b949886d88a61b607 Mon Sep 17 00:00:00 2001 From: Michelangelo Riccobene Date: Mon, 2 Mar 2026 10:43:39 +0100 Subject: [PATCH 1/8] use a specific version of the prebuilt db --- .github/workflows/qa-rpc-integration-tests-gnosis.yml | 2 +- .github/workflows/qa-rpc-integration-tests-latest.yml | 2 +- .github/workflows/qa-rpc-integration-tests-remote.yml | 2 +- .github/workflows/qa-rpc-integration-tests.yml | 2 +- .github/workflows/qa-rpc-performance-comparison-tests.yml | 2 +- .github/workflows/qa-rpc-performance-tests.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/qa-rpc-integration-tests-gnosis.yml b/.github/workflows/qa-rpc-integration-tests-gnosis.yml index 09cbc3a63e7..ac75bed24c3 100644 --- a/.github/workflows/qa-rpc-integration-tests-gnosis.yml +++ b/.github/workflows/qa-rpc-integration-tests-gnosis.yml @@ -29,7 +29,7 @@ jobs: cancel-in-progress: true runs-on: [ self-hosted, qa, Gnosis, rpc-integration ] env: - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/gnosis-reference-version/datadir + ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/gnosis-reference-version-3.4/datadir ERIGON_TESTBED_AREA: /opt/erigon-testbed ERIGON_QA_PATH: /home/qarunner/erigon-qa ERIGON_ASSERT: true diff --git a/.github/workflows/qa-rpc-integration-tests-latest.yml b/.github/workflows/qa-rpc-integration-tests-latest.yml index 4b225d92f5f..41fad25d403 100644 --- a/.github/workflows/qa-rpc-integration-tests-latest.yml +++ b/.github/workflows/qa-rpc-integration-tests-latest.yml @@ -33,7 +33,7 @@ jobs: cancel-in-progress: true runs-on: [ self-hosted, qa, Ethereum, rpc-latest-erigon ] env: - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir + ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.4/datadir ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir ERIGON_QA_PATH: /home/qarunner/erigon-qa TOTAL_TIME_SECONDS: 900 # 15 minutes diff --git a/.github/workflows/qa-rpc-integration-tests-remote.yml b/.github/workflows/qa-rpc-integration-tests-remote.yml index dcf50b6f6f7..c1941b96062 100644 --- a/.github/workflows/qa-rpc-integration-tests-remote.yml +++ b/.github/workflows/qa-rpc-integration-tests-remote.yml @@ -29,7 +29,7 @@ jobs: cancel-in-progress: true runs-on: [ self-hosted, qa, Ethereum, rpc-integration-commitment ] env: - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir + ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.4/datadir ERIGON_TESTBED_AREA: /opt/erigon-testbed ERIGON_QA_PATH: /home/qarunner/erigon-qa ERIGON_ASSERT: true diff --git a/.github/workflows/qa-rpc-integration-tests.yml b/.github/workflows/qa-rpc-integration-tests.yml index 49b9d953c09..16a675134fc 100644 --- a/.github/workflows/qa-rpc-integration-tests.yml +++ b/.github/workflows/qa-rpc-integration-tests.yml @@ -29,7 +29,7 @@ jobs: cancel-in-progress: true runs-on: [ self-hosted, qa, Ethereum, rpc-integration-commitment ] env: - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir + ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.4/datadir ERIGON_TESTBED_AREA: /opt/erigon-testbed ERIGON_QA_PATH: /home/qarunner/erigon-qa ERIGON_ASSERT: true diff --git a/.github/workflows/qa-rpc-performance-comparison-tests.yml b/.github/workflows/qa-rpc-performance-comparison-tests.yml index 0128d5500ac..7c4bfd18950 100644 --- a/.github/workflows/qa-rpc-performance-comparison-tests.yml +++ b/.github/workflows/qa-rpc-performance-comparison-tests.yml @@ -97,7 +97,7 @@ jobs: RUN_ID: ${{ needs.setup.outputs.run_id }} NETWORK: ${{ needs.setup.outputs.network }} ERIGON_REFERENCE_DIR: /opt/erigon-versions/reference-version - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir + ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.4/datadir ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir TOTAL_TIME_SECONDS: 1200 # 20 minutes GETH_INSTALL_DIR: /opt/go-ethereum diff --git a/.github/workflows/qa-rpc-performance-tests.yml b/.github/workflows/qa-rpc-performance-tests.yml index 6583b2c8328..b6c8bbeba72 100644 --- a/.github/workflows/qa-rpc-performance-tests.yml +++ b/.github/workflows/qa-rpc-performance-tests.yml @@ -88,7 +88,7 @@ jobs: RUN_ID: ${{ needs.setup.outputs.run_id }} NETWORK: ${{ needs.setup.outputs.network }} ERIGON_REFERENCE_DIR: /opt/erigon-versions/reference-version - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir + ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.4/datadir ERIGON_TESTBED_AREA: /opt/erigon-testbed ERIGON_QA_PATH: /home/qarunner/erigon-qa GETH_INSTALL_DIR: /opt/go-ethereum From de5ec901fcc0d19a078ad8e491c3ece5cee4661a Mon Sep 17 00:00:00 2001 From: Michelangelo Riccobene Date: Tue, 3 Mar 2026 09:14:40 +0100 Subject: [PATCH 2/8] Update .github/workflows/qa-rpc-performance-comparison-tests.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/qa-rpc-performance-comparison-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa-rpc-performance-comparison-tests.yml b/.github/workflows/qa-rpc-performance-comparison-tests.yml index 7c4bfd18950..4e95bb5a0bd 100644 --- a/.github/workflows/qa-rpc-performance-comparison-tests.yml +++ b/.github/workflows/qa-rpc-performance-comparison-tests.yml @@ -96,7 +96,7 @@ jobs: env: RUN_ID: ${{ needs.setup.outputs.run_id }} NETWORK: ${{ needs.setup.outputs.network }} - ERIGON_REFERENCE_DIR: /opt/erigon-versions/reference-version + ERIGON_REFERENCE_DIR: /opt/erigon-versions/reference-version-3.4 ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.4/datadir ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir TOTAL_TIME_SECONDS: 1200 # 20 minutes From f4fc5c7b2a90b76df0f456abdaa7bedcd6b6bb4d Mon Sep 17 00:00:00 2001 From: Michelangelo Riccobene Date: Tue, 3 Mar 2026 09:14:55 +0100 Subject: [PATCH 3/8] Update .github/workflows/qa-rpc-performance-tests.yml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/qa-rpc-performance-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa-rpc-performance-tests.yml b/.github/workflows/qa-rpc-performance-tests.yml index b6c8bbeba72..2c267b45276 100644 --- a/.github/workflows/qa-rpc-performance-tests.yml +++ b/.github/workflows/qa-rpc-performance-tests.yml @@ -87,7 +87,7 @@ jobs: env: RUN_ID: ${{ needs.setup.outputs.run_id }} NETWORK: ${{ needs.setup.outputs.network }} - ERIGON_REFERENCE_DIR: /opt/erigon-versions/reference-version + ERIGON_REFERENCE_DIR: /opt/erigon-versions/reference-version-3.4 ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.4/datadir ERIGON_TESTBED_AREA: /opt/erigon-testbed ERIGON_QA_PATH: /home/qarunner/erigon-qa From 2f1136dfd1b3fc6f99cdb3952f36d7a04e37bcb4 Mon Sep 17 00:00:00 2001 From: Michelangelo Riccobene Date: Tue, 3 Mar 2026 10:04:15 +0100 Subject: [PATCH 4/8] Calculate ERIGON_REFERENCE_DATA_DIR from branch --- .../qa-rpc-integration-tests-remote.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qa-rpc-integration-tests-remote.yml b/.github/workflows/qa-rpc-integration-tests-remote.yml index c1941b96062..b3b5d589beb 100644 --- a/.github/workflows/qa-rpc-integration-tests-remote.yml +++ b/.github/workflows/qa-rpc-integration-tests-remote.yml @@ -29,7 +29,6 @@ jobs: cancel-in-progress: true runs-on: [ self-hosted, qa, Ethereum, rpc-integration-commitment ] env: - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.4/datadir ERIGON_TESTBED_AREA: /opt/erigon-testbed ERIGON_QA_PATH: /home/qarunner/erigon-qa ERIGON_ASSERT: true @@ -40,6 +39,21 @@ jobs: - name: Check out repository uses: actions/checkout@v6 + - name: Set reference data dir based on branch + run: | + # For pull_request events base_ref is the target branch name; for push/dispatch parse from ref. + BRANCH="${{ github.base_ref }}" + if [ -z "$BRANCH" ]; then + BRANCH="${{ github.ref }}" + BRANCH="${BRANCH#refs/heads/}" + fi + if [[ "$BRANCH" == release/* ]]; then + VERSION="${BRANCH#release/}" + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version-${VERSION}/datadir" >> $GITHUB_ENV + else + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version/datadir" >> $GITHUB_ENV + fi + - name: Clean Erigon Build Directory run: | make clean From 69816ec0eb4f04b85341c037d8632dcd70550ff2 Mon Sep 17 00:00:00 2001 From: Michelangelo Riccobene Date: Tue, 3 Mar 2026 10:48:22 +0100 Subject: [PATCH 5/8] Calculate ERIGON_REFERENCE_DATA_DIR from branch --- .../qa-rpc-integration-tests-gnosis.yml | 16 +++++++++++++++- .../qa-rpc-integration-tests-latest.yml | 16 +++++++++++++++- .../workflows/qa-rpc-integration-tests.yml | 16 +++++++++++++++- .../qa-rpc-performance-comparison-tests.yml | 19 +++++++++++++++++-- .../workflows/qa-rpc-performance-tests.yml | 19 +++++++++++++++++-- 5 files changed, 79 insertions(+), 7 deletions(-) diff --git a/.github/workflows/qa-rpc-integration-tests-gnosis.yml b/.github/workflows/qa-rpc-integration-tests-gnosis.yml index ac75bed24c3..1965a18725d 100644 --- a/.github/workflows/qa-rpc-integration-tests-gnosis.yml +++ b/.github/workflows/qa-rpc-integration-tests-gnosis.yml @@ -29,7 +29,6 @@ jobs: cancel-in-progress: true runs-on: [ self-hosted, qa, Gnosis, rpc-integration ] env: - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/gnosis-reference-version-3.4/datadir ERIGON_TESTBED_AREA: /opt/erigon-testbed ERIGON_QA_PATH: /home/qarunner/erigon-qa ERIGON_ASSERT: true @@ -40,6 +39,21 @@ jobs: - name: Check out repository uses: actions/checkout@v6 + - name: Set reference data dir based on branch + run: | + # For pull_request events base_ref is the target branch name; for push/dispatch parse from ref. + BRANCH="${{ github.base_ref }}" + if [ -z "$BRANCH" ]; then + BRANCH="${{ github.ref }}" + BRANCH="${BRANCH#refs/heads/}" + fi + if [[ "$BRANCH" == release/* ]]; then + VERSION="${BRANCH#release/}" + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/gnosis-reference-version-${VERSION}/datadir" >> $GITHUB_ENV + else + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/gnosis-reference-version/datadir" >> $GITHUB_ENV + fi + - name: Clean Erigon Build Directory run: | make clean diff --git a/.github/workflows/qa-rpc-integration-tests-latest.yml b/.github/workflows/qa-rpc-integration-tests-latest.yml index 41fad25d403..becbde63ae2 100644 --- a/.github/workflows/qa-rpc-integration-tests-latest.yml +++ b/.github/workflows/qa-rpc-integration-tests-latest.yml @@ -33,7 +33,6 @@ jobs: cancel-in-progress: true runs-on: [ self-hosted, qa, Ethereum, rpc-latest-erigon ] env: - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.4/datadir ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir ERIGON_QA_PATH: /home/qarunner/erigon-qa TOTAL_TIME_SECONDS: 900 # 15 minutes @@ -46,6 +45,21 @@ jobs: - name: Check out repository uses: actions/checkout@v6 + - name: Set reference data dir based on branch + run: | + # For pull_request events base_ref is the target branch name; for push/dispatch parse from ref. + BRANCH="${{ github.base_ref }}" + if [ -z "$BRANCH" ]; then + BRANCH="${{ github.ref }}" + BRANCH="${BRANCH#refs/heads/}" + fi + if [[ "$BRANCH" == release/* ]]; then + VERSION="${BRANCH#release/}" + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version-${VERSION}/datadir" >> $GITHUB_ENV + else + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version/datadir" >> $GITHUB_ENV + fi + - name: Clean Erigon Build Directory run: | make clean diff --git a/.github/workflows/qa-rpc-integration-tests.yml b/.github/workflows/qa-rpc-integration-tests.yml index 16a675134fc..bd60aa44025 100644 --- a/.github/workflows/qa-rpc-integration-tests.yml +++ b/.github/workflows/qa-rpc-integration-tests.yml @@ -29,7 +29,6 @@ jobs: cancel-in-progress: true runs-on: [ self-hosted, qa, Ethereum, rpc-integration-commitment ] env: - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.4/datadir ERIGON_TESTBED_AREA: /opt/erigon-testbed ERIGON_QA_PATH: /home/qarunner/erigon-qa ERIGON_ASSERT: true @@ -40,6 +39,21 @@ jobs: - name: Check out repository uses: actions/checkout@v6 + - name: Set reference data dir based on branch + run: | + # For pull_request events base_ref is the target branch name; for push/dispatch parse from ref. + BRANCH="${{ github.base_ref }}" + if [ -z "$BRANCH" ]; then + BRANCH="${{ github.ref }}" + BRANCH="${BRANCH#refs/heads/}" + fi + if [[ "$BRANCH" == release/* ]]; then + VERSION="${BRANCH#release/}" + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version-${VERSION}/datadir" >> $GITHUB_ENV + else + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version/datadir" >> $GITHUB_ENV + fi + - name: Clean Erigon Build Directory run: | make clean diff --git a/.github/workflows/qa-rpc-performance-comparison-tests.yml b/.github/workflows/qa-rpc-performance-comparison-tests.yml index 4e95bb5a0bd..d4b17e40d1a 100644 --- a/.github/workflows/qa-rpc-performance-comparison-tests.yml +++ b/.github/workflows/qa-rpc-performance-comparison-tests.yml @@ -96,14 +96,29 @@ jobs: env: RUN_ID: ${{ needs.setup.outputs.run_id }} NETWORK: ${{ needs.setup.outputs.network }} - ERIGON_REFERENCE_DIR: /opt/erigon-versions/reference-version-3.4 - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.4/datadir ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir TOTAL_TIME_SECONDS: 1200 # 20 minutes GETH_INSTALL_DIR: /opt/go-ethereum CLIENT: ${{ matrix.client }} steps: + - name: Set reference data dir based on branch + run: | + # For pull_request events base_ref is the target branch name; for push/dispatch parse from ref. + BRANCH="${{ github.base_ref }}" + if [ -z "$BRANCH" ]; then + BRANCH="${{ github.ref }}" + BRANCH="${BRANCH#refs/heads/}" + fi + if [[ "$BRANCH" == release/* ]]; then + VERSION="${BRANCH#release/}" + ERIGON_REFERENCE_DIR="/opt/erigon-versions/reference-version-${VERSION}" + else + ERIGON_REFERENCE_DIR="/opt/erigon-versions/reference-version" + fi + echo "ERIGON_REFERENCE_DIR=${ERIGON_REFERENCE_DIR}" >> $GITHUB_ENV + echo "ERIGON_REFERENCE_DATA_DIR=${ERIGON_REFERENCE_DIR}/datadir" >> $GITHUB_ENV + - name: Checkout Erigon repository if: matrix.client == 'erigon' uses: actions/checkout@v6 diff --git a/.github/workflows/qa-rpc-performance-tests.yml b/.github/workflows/qa-rpc-performance-tests.yml index 2c267b45276..1e8bdef4560 100644 --- a/.github/workflows/qa-rpc-performance-tests.yml +++ b/.github/workflows/qa-rpc-performance-tests.yml @@ -87,14 +87,29 @@ jobs: env: RUN_ID: ${{ needs.setup.outputs.run_id }} NETWORK: ${{ needs.setup.outputs.network }} - ERIGON_REFERENCE_DIR: /opt/erigon-versions/reference-version-3.4 - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.4/datadir ERIGON_TESTBED_AREA: /opt/erigon-testbed ERIGON_QA_PATH: /home/qarunner/erigon-qa GETH_INSTALL_DIR: /opt/go-ethereum CLIENT: ${{ matrix.client }} steps: + - name: Set reference data dir based on branch + run: | + # For pull_request events base_ref is the target branch name; for push/dispatch parse from ref. + BRANCH="${{ github.base_ref }}" + if [ -z "$BRANCH" ]; then + BRANCH="${{ github.ref }}" + BRANCH="${BRANCH#refs/heads/}" + fi + if [[ "$BRANCH" == release/* ]]; then + VERSION="${BRANCH#release/}" + ERIGON_REFERENCE_DIR="/opt/erigon-versions/reference-version-${VERSION}" + else + ERIGON_REFERENCE_DIR="/opt/erigon-versions/reference-version" + fi + echo "ERIGON_REFERENCE_DIR=${ERIGON_REFERENCE_DIR}" >> $GITHUB_ENV + echo "ERIGON_REFERENCE_DATA_DIR=${ERIGON_REFERENCE_DIR}/datadir" >> $GITHUB_ENV + - name: Checkout Erigon repository if: matrix.client == 'erigon' uses: actions/checkout@v6 From 636226d02c0e1e44df7b7c1fe70bf4dfbfe20c4e Mon Sep 17 00:00:00 2001 From: Michelangelo Riccobene Date: Tue, 3 Mar 2026 11:17:01 +0100 Subject: [PATCH 6/8] Calculate ERIGON_REFERENCE_DATA_DIR from branch --- .github/workflows/qa-tip-tracking-gnosis.yml | 16 +++++++++++++++- .github/workflows/qa-tip-tracking-with-load.yml | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/.github/workflows/qa-tip-tracking-gnosis.yml b/.github/workflows/qa-tip-tracking-gnosis.yml index 44352cccf15..8f97c7a5e0b 100644 --- a/.github/workflows/qa-tip-tracking-gnosis.yml +++ b/.github/workflows/qa-tip-tracking-gnosis.yml @@ -17,7 +17,6 @@ jobs: runs-on: [self-hosted, qa, Gnosis, tip-tracking] timeout-minutes: 1200 env: - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.3/datadir ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir ERIGON_QA_PATH: /home/qarunner/erigon-qa TRACKING_TIME_SECONDS: 7200 # 2 hours @@ -28,6 +27,21 @@ jobs: - name: Check out repository uses: actions/checkout@v6 + - name: Set reference data dir based on branch + run: | + # For pull_request events base_ref is the target branch name; for push/dispatch parse from ref. + BRANCH="${{ github.base_ref }}" + if [ -z "$BRANCH" ]; then + BRANCH="${{ github.ref }}" + BRANCH="${BRANCH#refs/heads/}" + fi + if [[ "$BRANCH" == release/* ]]; then + VERSION="${BRANCH#release/}" + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/gnosis-reference-version-${VERSION}/datadir" >> $GITHUB_ENV + else + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/gnosis-reference-version/datadir" >> $GITHUB_ENV + fi + - name: Clean Erigon Build Directory run: | make clean diff --git a/.github/workflows/qa-tip-tracking-with-load.yml b/.github/workflows/qa-tip-tracking-with-load.yml index 8f6de747eea..7c89428d5b2 100644 --- a/.github/workflows/qa-tip-tracking-with-load.yml +++ b/.github/workflows/qa-tip-tracking-with-load.yml @@ -47,7 +47,6 @@ jobs: runs-on: ${{ matrix.runs-on }} timeout-minutes: 300 # 5 hours env: - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-main/datadir ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir ERIGON_QA_PATH: /home/qarunner/erigon-qa TRACKING_TIME_SECONDS: 7200 # 2 hours @@ -61,6 +60,21 @@ jobs: LOAD_MODE: ${{ github.event.inputs.skip_pprof == 'true' && 'measure' || 'load' }} steps: + - name: Set reference data dir based on branch + run: | + # For pull_request events base_ref is the target branch name; for push/dispatch parse from ref. + BRANCH="${{ github.base_ref }}" + if [ -z "$BRANCH" ]; then + BRANCH="${{ github.ref }}" + BRANCH="${BRANCH#refs/heads/}" + fi + if [[ "$BRANCH" == release/* ]]; then + VERSION="${BRANCH#release/}" + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version-${VERSION}/datadir" >> $GITHUB_ENV + else + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version/datadir" >> $GITHUB_ENV + fi + - name: Print job parameters if: matrix.client == 'erigon' || (matrix.client == 'geth' && github.event.inputs.run_geth == 'true') run: | From 72daf47cd142c5833ce9934e412ebd1dc8128b70 Mon Sep 17 00:00:00 2001 From: Michelangelo Riccobene Date: Tue, 3 Mar 2026 11:19:25 +0100 Subject: [PATCH 7/8] Use MINOR-1 in tip-tracking to test upgrade behavior --- .github/workflows/qa-tip-tracking-gnosis.yml | 5 ++++- .github/workflows/qa-tip-tracking.yml | 19 ++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/qa-tip-tracking-gnosis.yml b/.github/workflows/qa-tip-tracking-gnosis.yml index 8f97c7a5e0b..2da23db2dff 100644 --- a/.github/workflows/qa-tip-tracking-gnosis.yml +++ b/.github/workflows/qa-tip-tracking-gnosis.yml @@ -37,7 +37,10 @@ jobs: fi if [[ "$BRANCH" == release/* ]]; then VERSION="${BRANCH#release/}" - echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/gnosis-reference-version-${VERSION}/datadir" >> $GITHUB_ENV + MAJOR="${VERSION%.*}" + MINOR="${VERSION##*.}" + PREV_VERSION="${MAJOR}.$((MINOR - 1))" + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/gnosis-reference-version-${PREV_VERSION}/datadir" >> $GITHUB_ENV else echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/gnosis-reference-version/datadir" >> $GITHUB_ENV fi diff --git a/.github/workflows/qa-tip-tracking.yml b/.github/workflows/qa-tip-tracking.yml index 3fe17771806..97bd56f5234 100644 --- a/.github/workflows/qa-tip-tracking.yml +++ b/.github/workflows/qa-tip-tracking.yml @@ -17,7 +17,6 @@ jobs: runs-on: [self-hosted, qa, Ethereum, tip-tracking] timeout-minutes: 1300 # 21.66667 hours env: - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.3/datadir ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir ERIGON_QA_PATH: /home/qarunner/erigon-qa TRACKING_TIME_SECONDS: 7200 # 2 hours @@ -28,6 +27,24 @@ jobs: - name: Check out repository uses: actions/checkout@v6 + - name: Set reference data dir based on branch + run: | + # For pull_request events base_ref is the target branch name; for push/dispatch parse from ref. + BRANCH="${{ github.base_ref }}" + if [ -z "$BRANCH" ]; then + BRANCH="${{ github.ref }}" + BRANCH="${BRANCH#refs/heads/}" + fi + if [[ "$BRANCH" == release/* ]]; then + VERSION="${BRANCH#release/}" + MAJOR="${VERSION%.*}" + MINOR="${VERSION##*.}" + PREV_VERSION="${MAJOR}.$((MINOR - 1))" + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version-${PREV_VERSION}/datadir" >> $GITHUB_ENV + else + echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version/datadir" >> $GITHUB_ENV + fi + - name: Clean Erigon Build Directory run: | make clean From 3a5d7925740009503bcee6f002e7c6c1300df042 Mon Sep 17 00:00:00 2001 From: Michelangelo Riccobene Date: Tue, 3 Mar 2026 12:33:51 +0100 Subject: [PATCH 8/8] constrained and w/load tip-tracking tests run only on main branch --- .../workflows/qa-constrained-tip-tracking.yml | 2 +- .github/workflows/qa-tip-tracking-with-load.yml | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/qa-constrained-tip-tracking.yml b/.github/workflows/qa-constrained-tip-tracking.yml index 10934046c8d..31eea02870b 100644 --- a/.github/workflows/qa-constrained-tip-tracking.yml +++ b/.github/workflows/qa-constrained-tip-tracking.yml @@ -22,7 +22,7 @@ jobs: runs-on: [ self-hosted, qa, "${{ matrix.backend }}", tip-tracking ] timeout-minutes: 780 # 13 hours env: - ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-main/datadir + 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: 7200 # 2 hours diff --git a/.github/workflows/qa-tip-tracking-with-load.yml b/.github/workflows/qa-tip-tracking-with-load.yml index 7c89428d5b2..19642ccda98 100644 --- a/.github/workflows/qa-tip-tracking-with-load.yml +++ b/.github/workflows/qa-tip-tracking-with-load.yml @@ -47,6 +47,7 @@ jobs: runs-on: ${{ matrix.runs-on }} timeout-minutes: 300 # 5 hours 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: 7200 # 2 hours @@ -60,21 +61,6 @@ jobs: LOAD_MODE: ${{ github.event.inputs.skip_pprof == 'true' && 'measure' || 'load' }} steps: - - name: Set reference data dir based on branch - run: | - # For pull_request events base_ref is the target branch name; for push/dispatch parse from ref. - BRANCH="${{ github.base_ref }}" - if [ -z "$BRANCH" ]; then - BRANCH="${{ github.ref }}" - BRANCH="${BRANCH#refs/heads/}" - fi - if [[ "$BRANCH" == release/* ]]; then - VERSION="${BRANCH#release/}" - echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version-${VERSION}/datadir" >> $GITHUB_ENV - else - echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version/datadir" >> $GITHUB_ENV - fi - - name: Print job parameters if: matrix.client == 'erigon' || (matrix.client == 'geth' && github.event.inputs.run_geth == 'true') run: |