Skip to content

Commit 350ebbc

Browse files
authored
chore(ci): fix benchmark job dependency (databendlabs#15087)
1 parent 43fb298 commit 350ebbc

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

.github/workflows/reuse.benchmark.yml

+21-20
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,8 @@ jobs:
9595
source: ${{ inputs.source }}
9696
source_id: ${{ inputs.source_id }}
9797

98-
cloud:
98+
load:
9999
runs-on: ubuntu-latest
100-
strategy:
101-
matrix:
102-
include:
103-
- { dataset: hits, size: Small }
104-
- { dataset: hits, size: Large }
105-
- { dataset: tpch, size: Small }
106-
- { dataset: tpch, size: Large }
107-
fail-fast: true
108-
max-parallel: 1
109100
steps:
110101
- uses: actions/checkout@v4
111102
if: inputs.source == 'release'
@@ -115,16 +106,16 @@ jobs:
115106
ref: "refs/pull/${{ inputs.source_id }}/merge"
116107
- uses: ./.github/actions/setup_bendsql
117108
- uses: ./.github/actions/benchmark_cloud
118-
if: inputs.target == 'cloud' || inputs.target == 'all'
119-
timeout-minutes: 20
109+
if: inputs.target == 'load' || inputs.target == 'all'
110+
timeout-minutes: 120
120111
id: benchmark
121112
with:
122113
sha: ${{ inputs.sha }}
123114
run_id: ${{ inputs.run_id }}
124-
dataset: ${{ matrix.dataset }}
115+
dataset: load
125116
source: ${{ inputs.source }}
126117
source_id: ${{ inputs.source_id }}
127-
size: ${{ matrix.size }}
118+
size: Small
128119
version: ${{ inputs.version }}
129120
cloud_user: ${{ secrets.BENCHMARK_CLOUD_USER }}
130121
cloud_password: ${{ secrets.BENCHMARK_CLOUD_PASSWORD }}
@@ -135,10 +126,21 @@ jobs:
135126
env:
136127
BENDSQL_DSN: "databend://${{ secrets.BENCHMARK_CLOUD_USER }}:${{ secrets.BENCHMARK_CLOUD_PASSWORD }}@${{ secrets.BENCHMARK_CLOUD_GATEWAY }}:443/?warehouse=default"
137128
run: |
129+
echo "DROP DATABASE IF EXISTS load_test_${{ inputs.run_id }};" | bendsql
138130
echo "DROP WAREHOUSE IF EXISTS 'benchmark-${{ inputs.run_id }}';" | bendsql
139131
140-
load:
132+
cloud:
141133
runs-on: ubuntu-latest
134+
needs: load
135+
strategy:
136+
matrix:
137+
include:
138+
- { dataset: hits, size: Small }
139+
- { dataset: hits, size: Large }
140+
- { dataset: tpch, size: Small }
141+
- { dataset: tpch, size: Large }
142+
fail-fast: true
143+
max-parallel: 1
142144
steps:
143145
- uses: actions/checkout@v4
144146
if: inputs.source == 'release'
@@ -148,16 +150,16 @@ jobs:
148150
ref: "refs/pull/${{ inputs.source_id }}/merge"
149151
- uses: ./.github/actions/setup_bendsql
150152
- uses: ./.github/actions/benchmark_cloud
151-
if: inputs.target == 'load' || inputs.target == 'all'
152-
timeout-minutes: 120
153+
if: inputs.target == 'cloud' || inputs.target == 'all'
154+
timeout-minutes: 20
153155
id: benchmark
154156
with:
155157
sha: ${{ inputs.sha }}
156158
run_id: ${{ inputs.run_id }}
157-
dataset: load
159+
dataset: ${{ matrix.dataset }}
158160
source: ${{ inputs.source }}
159161
source_id: ${{ inputs.source_id }}
160-
size: Small
162+
size: ${{ matrix.size }}
161163
version: ${{ inputs.version }}
162164
cloud_user: ${{ secrets.BENCHMARK_CLOUD_USER }}
163165
cloud_password: ${{ secrets.BENCHMARK_CLOUD_PASSWORD }}
@@ -168,7 +170,6 @@ jobs:
168170
env:
169171
BENDSQL_DSN: "databend://${{ secrets.BENCHMARK_CLOUD_USER }}:${{ secrets.BENCHMARK_CLOUD_PASSWORD }}@${{ secrets.BENCHMARK_CLOUD_GATEWAY }}:443/?warehouse=default"
170172
run: |
171-
echo "DROP DATABASE IF EXISTS load_test_${{ inputs.run_id }};" | bendsql
172173
echo "DROP WAREHOUSE IF EXISTS 'benchmark-${{ inputs.run_id }}';" | bendsql
173174
174175
comment:

0 commit comments

Comments
 (0)