Skip to content

Commit 7d69e62

Browse files
mriccobeneCopilot
mriccobene
and
Copilot
authored
qa-tests: use a specific version of the prebuilt db in RPC and Tip-Tracking tests (#19565)
This PR allows us to use different DB versions between main branch and release branch to avoid any incompatibility problems between databases --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 46e8af5 commit 7d69e62

10 files changed

+132
-12
lines changed

‎.github/workflows/qa-constrained-tip-tracking.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: [ self-hosted, qa, "${{ matrix.backend }}", tip-tracking ]
2323
timeout-minutes: 780 # 13 hours
2424
env:
25-
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-main/datadir
25+
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir
2626
ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir
2727
ERIGON_QA_PATH: /home/qarunner/erigon-qa
2828
TRACKING_TIME_SECONDS: 7200 # 2 hours

‎.github/workflows/qa-rpc-integration-tests-gnosis.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
cancel-in-progress: true
3030
runs-on: [ self-hosted, qa, Gnosis, rpc-integration ]
3131
env:
32-
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/gnosis-reference-version/datadir
3332
ERIGON_TESTBED_AREA: /opt/erigon-testbed
3433
ERIGON_QA_PATH: /home/qarunner/erigon-qa
3534
ERIGON_ASSERT: true
@@ -40,6 +39,21 @@ jobs:
4039
- name: Check out repository
4140
uses: actions/checkout@v6
4241

42+
- name: Set reference data dir based on branch
43+
run: |
44+
# For pull_request events base_ref is the target branch name; for push/dispatch parse from ref.
45+
BRANCH="${{ github.base_ref }}"
46+
if [ -z "$BRANCH" ]; then
47+
BRANCH="${{ github.ref }}"
48+
BRANCH="${BRANCH#refs/heads/}"
49+
fi
50+
if [[ "$BRANCH" == release/* ]]; then
51+
VERSION="${BRANCH#release/}"
52+
echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/gnosis-reference-version-${VERSION}/datadir" >> $GITHUB_ENV
53+
else
54+
echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/gnosis-reference-version/datadir" >> $GITHUB_ENV
55+
fi
56+
4357
- name: Clean Erigon Build Directory
4458
run: |
4559
make clean

‎.github/workflows/qa-rpc-integration-tests-latest.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
cancel-in-progress: true
3434
runs-on: [ self-hosted, qa, Ethereum, rpc-latest-erigon ]
3535
env:
36-
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir
3736
ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir
3837
ERIGON_QA_PATH: /home/qarunner/erigon-qa
3938
TOTAL_TIME_SECONDS: 900 # 15 minutes
@@ -46,6 +45,21 @@ jobs:
4645
- name: Check out repository
4746
uses: actions/checkout@v6
4847

48+
- name: Set reference data dir based on branch
49+
run: |
50+
# For pull_request events base_ref is the target branch name; for push/dispatch parse from ref.
51+
BRANCH="${{ github.base_ref }}"
52+
if [ -z "$BRANCH" ]; then
53+
BRANCH="${{ github.ref }}"
54+
BRANCH="${BRANCH#refs/heads/}"
55+
fi
56+
if [[ "$BRANCH" == release/* ]]; then
57+
VERSION="${BRANCH#release/}"
58+
echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version-${VERSION}/datadir" >> $GITHUB_ENV
59+
else
60+
echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version/datadir" >> $GITHUB_ENV
61+
fi
62+
4963
- name: Clean Erigon Build Directory
5064
run: |
5165
make clean

‎.github/workflows/qa-rpc-integration-tests-remote.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
cancel-in-progress: true
3030
runs-on: [ self-hosted, qa, Ethereum, rpc-integration-commitment ]
3131
env:
32-
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir
3332
ERIGON_TESTBED_AREA: /opt/erigon-testbed
3433
ERIGON_QA_PATH: /home/qarunner/erigon-qa
3534
ERIGON_ASSERT: true
@@ -40,6 +39,21 @@ jobs:
4039
- name: Check out repository
4140
uses: actions/checkout@v6
4241

42+
- name: Set reference data dir based on branch
43+
run: |
44+
# For pull_request events base_ref is the target branch name; for push/dispatch parse from ref.
45+
BRANCH="${{ github.base_ref }}"
46+
if [ -z "$BRANCH" ]; then
47+
BRANCH="${{ github.ref }}"
48+
BRANCH="${BRANCH#refs/heads/}"
49+
fi
50+
if [[ "$BRANCH" == release/* ]]; then
51+
VERSION="${BRANCH#release/}"
52+
echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version-${VERSION}/datadir" >> $GITHUB_ENV
53+
else
54+
echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version/datadir" >> $GITHUB_ENV
55+
fi
56+
4357
- name: Clean Erigon Build Directory
4458
run: |
4559
make clean

‎.github/workflows/qa-rpc-integration-tests.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
cancel-in-progress: true
3030
runs-on: [ self-hosted, qa, Ethereum, rpc-integration-commitment ]
3131
env:
32-
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir
3332
ERIGON_TESTBED_AREA: /opt/erigon-testbed
3433
ERIGON_QA_PATH: /home/qarunner/erigon-qa
3534
ERIGON_ASSERT: true
@@ -40,6 +39,21 @@ jobs:
4039
- name: Check out repository
4140
uses: actions/checkout@v6
4241

42+
- name: Set reference data dir based on branch
43+
run: |
44+
# For pull_request events base_ref is the target branch name; for push/dispatch parse from ref.
45+
BRANCH="${{ github.base_ref }}"
46+
if [ -z "$BRANCH" ]; then
47+
BRANCH="${{ github.ref }}"
48+
BRANCH="${BRANCH#refs/heads/}"
49+
fi
50+
if [[ "$BRANCH" == release/* ]]; then
51+
VERSION="${BRANCH#release/}"
52+
echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version-${VERSION}/datadir" >> $GITHUB_ENV
53+
else
54+
echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version/datadir" >> $GITHUB_ENV
55+
fi
56+
4357
- name: Clean Erigon Build Directory
4458
run: |
4559
make clean

‎.github/workflows/qa-rpc-performance-comparison-tests.yml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,29 @@ jobs:
9696
env:
9797
RUN_ID: ${{ needs.setup.outputs.run_id }}
9898
NETWORK: ${{ needs.setup.outputs.network }}
99-
ERIGON_REFERENCE_DIR: /opt/erigon-versions/reference-version
100-
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir
10199
ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir
102100
TOTAL_TIME_SECONDS: 1200 # 20 minutes
103101
GETH_INSTALL_DIR: /opt/go-ethereum
104102
CLIENT: ${{ matrix.client }}
105103

106104
steps:
105+
- name: Set reference data dir based on branch
106+
run: |
107+
# For pull_request events base_ref is the target branch name; for push/dispatch parse from ref.
108+
BRANCH="${{ github.base_ref }}"
109+
if [ -z "$BRANCH" ]; then
110+
BRANCH="${{ github.ref }}"
111+
BRANCH="${BRANCH#refs/heads/}"
112+
fi
113+
if [[ "$BRANCH" == release/* ]]; then
114+
VERSION="${BRANCH#release/}"
115+
ERIGON_REFERENCE_DIR="/opt/erigon-versions/reference-version-${VERSION}"
116+
else
117+
ERIGON_REFERENCE_DIR="/opt/erigon-versions/reference-version"
118+
fi
119+
echo "ERIGON_REFERENCE_DIR=${ERIGON_REFERENCE_DIR}" >> $GITHUB_ENV
120+
echo "ERIGON_REFERENCE_DATA_DIR=${ERIGON_REFERENCE_DIR}/datadir" >> $GITHUB_ENV
121+
107122
- name: Checkout Erigon repository
108123
if: matrix.client == 'erigon'
109124
uses: actions/checkout@v6

‎.github/workflows/qa-rpc-performance-tests.yml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,29 @@ jobs:
8787
env:
8888
RUN_ID: ${{ needs.setup.outputs.run_id }}
8989
NETWORK: ${{ needs.setup.outputs.network }}
90-
ERIGON_REFERENCE_DIR: /opt/erigon-versions/reference-version
91-
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir
9290
ERIGON_TESTBED_AREA: /opt/erigon-testbed
9391
ERIGON_QA_PATH: /home/qarunner/erigon-qa
9492
GETH_INSTALL_DIR: /opt/go-ethereum
9593
CLIENT: ${{ matrix.client }}
9694

9795
steps:
96+
- name: Set reference data dir based on branch
97+
run: |
98+
# For pull_request events base_ref is the target branch name; for push/dispatch parse from ref.
99+
BRANCH="${{ github.base_ref }}"
100+
if [ -z "$BRANCH" ]; then
101+
BRANCH="${{ github.ref }}"
102+
BRANCH="${BRANCH#refs/heads/}"
103+
fi
104+
if [[ "$BRANCH" == release/* ]]; then
105+
VERSION="${BRANCH#release/}"
106+
ERIGON_REFERENCE_DIR="/opt/erigon-versions/reference-version-${VERSION}"
107+
else
108+
ERIGON_REFERENCE_DIR="/opt/erigon-versions/reference-version"
109+
fi
110+
echo "ERIGON_REFERENCE_DIR=${ERIGON_REFERENCE_DIR}" >> $GITHUB_ENV
111+
echo "ERIGON_REFERENCE_DATA_DIR=${ERIGON_REFERENCE_DIR}/datadir" >> $GITHUB_ENV
112+
98113
- name: Checkout Erigon repository
99114
if: matrix.client == 'erigon'
100115
uses: actions/checkout@v6

‎.github/workflows/qa-tip-tracking-gnosis.yml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
runs-on: [self-hosted, qa, Gnosis, tip-tracking]
1818
timeout-minutes: 1200
1919
env:
20-
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.3/datadir
2120
ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir
2221
ERIGON_QA_PATH: /home/qarunner/erigon-qa
2322
TRACKING_TIME_SECONDS: 7200 # 2 hours
@@ -28,6 +27,24 @@ jobs:
2827
- name: Check out repository
2928
uses: actions/checkout@v6
3029

30+
- name: Set reference data dir based on branch
31+
run: |
32+
# For pull_request events base_ref is the target branch name; for push/dispatch parse from ref.
33+
BRANCH="${{ github.base_ref }}"
34+
if [ -z "$BRANCH" ]; then
35+
BRANCH="${{ github.ref }}"
36+
BRANCH="${BRANCH#refs/heads/}"
37+
fi
38+
if [[ "$BRANCH" == release/* ]]; then
39+
VERSION="${BRANCH#release/}"
40+
MAJOR="${VERSION%.*}"
41+
MINOR="${VERSION##*.}"
42+
PREV_VERSION="${MAJOR}.$((MINOR - 1))"
43+
echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/gnosis-reference-version-${PREV_VERSION}/datadir" >> $GITHUB_ENV
44+
else
45+
echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/gnosis-reference-version/datadir" >> $GITHUB_ENV
46+
fi
47+
3148
- name: Clean Erigon Build Directory
3249
run: |
3350
make clean

‎.github/workflows/qa-tip-tracking-with-load.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
runs-on: ${{ matrix.runs-on }}
4848
timeout-minutes: 300 # 5 hours
4949
env:
50-
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-main/datadir
50+
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir
5151
ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir
5252
ERIGON_QA_PATH: /home/qarunner/erigon-qa
5353
TRACKING_TIME_SECONDS: 7200 # 2 hours

‎.github/workflows/qa-tip-tracking.yml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
runs-on: [self-hosted, qa, Ethereum, tip-tracking]
1818
timeout-minutes: 1300 # 21.66667 hours
1919
env:
20-
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-3.3/datadir
2120
ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir
2221
ERIGON_QA_PATH: /home/qarunner/erigon-qa
2322
TRACKING_TIME_SECONDS: 7200 # 2 hours
@@ -28,6 +27,24 @@ jobs:
2827
- name: Check out repository
2928
uses: actions/checkout@v6
3029

30+
- name: Set reference data dir based on branch
31+
run: |
32+
# For pull_request events base_ref is the target branch name; for push/dispatch parse from ref.
33+
BRANCH="${{ github.base_ref }}"
34+
if [ -z "$BRANCH" ]; then
35+
BRANCH="${{ github.ref }}"
36+
BRANCH="${BRANCH#refs/heads/}"
37+
fi
38+
if [[ "$BRANCH" == release/* ]]; then
39+
VERSION="${BRANCH#release/}"
40+
MAJOR="${VERSION%.*}"
41+
MINOR="${VERSION##*.}"
42+
PREV_VERSION="${MAJOR}.$((MINOR - 1))"
43+
echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version-${PREV_VERSION}/datadir" >> $GITHUB_ENV
44+
else
45+
echo "ERIGON_REFERENCE_DATA_DIR=/opt/erigon-versions/reference-version/datadir" >> $GITHUB_ENV
46+
fi
47+
3148
- name: Clean Erigon Build Directory
3249
run: |
3350
make clean

0 commit comments

Comments
 (0)