Skip to content

Commit 0ba71fb

Browse files
authored
ci: auto retry more workflows (#18298)
1 parent c893860 commit 0ba71fb

File tree

10 files changed

+50
-118
lines changed

10 files changed

+50
-118
lines changed

.github/workflows/bindings.python.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
- Linux
3535
- 4c16g
3636
- aws
37-
- spot
3837
strategy:
3938
matrix:
4039
include:

.github/workflows/cloud.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ jobs:
5252
- Linux
5353
- 8c32g
5454
- aws
55-
- spot
5655
strategy:
5756
matrix:
5857
include:
@@ -84,7 +83,6 @@ jobs:
8483
- Linux
8584
- 2c8g
8685
- aws
87-
- spot
8886
outputs:
8987
tag: ${{ steps.prepare.outputs.tag }}
9088
steps:
@@ -164,6 +162,4 @@ jobs:
164162
source: pr
165163
source_id: ${{ github.event.pull_request.number }}
166164
version: ${{ needs.docker.outputs.tag }}
167-
runner_provider: aws
168-
runner_capacity: spot
169165
target: ${{ needs.info.outputs.target }}

.github/workflows/dev.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ jobs:
5454
with:
5555
build_profile: ci
5656
runner_provider: aws
57-
runner_capacity: spot
5857
license_type: trial
5958

6059
ready:

.github/workflows/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
with:
4646
build_profile: release
4747
runner_provider: aws
48-
runner_capacity: spot
4948
license_type: enterprise
5049

5150
# macos:

.github/workflows/meta.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
- Linux
4343
- 8c32g
4444
- aws
45-
- spot
4645
strategy:
4746
matrix:
4847
include:
@@ -68,7 +67,6 @@ jobs:
6867
- Linux
6968
- 4c16g
7069
- aws
71-
- spot
7270
steps:
7371
- uses: actions/checkout@v4
7472
with:

.github/workflows/release.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,6 @@ jobs:
565565
- Linux
566566
- 4c16g
567567
- aws
568-
- spot
569568
needs: [create_release, notify]
570569
steps:
571570
- uses: actions/checkout@v4
@@ -601,8 +600,6 @@ jobs:
601600
source: release
602601
source_id: ${{ needs.create_release.outputs.version }}
603602
version: ${{ needs.create_release.outputs.version }}
604-
runner_provider: aws
605-
runner_capacity: spot
606603
target: all
607604

608605
deb:

.github/workflows/retry.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
workflows:
66
- Dev
77
- Main
8+
- Cloud
9+
- Release
810
types:
911
- completed
1012

.github/workflows/reuse.benchmark.yml

Lines changed: 47 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,6 @@ on:
2323
description: The version of databend to run
2424
required: true
2525
type: string
26-
runner_provider:
27-
description: "Self-hosted runner provider, aws or gcp"
28-
type: string
29-
required: true
30-
runner_capacity:
31-
description: "Self-hosted runner capacity, spot or on-demand"
32-
type: string
33-
required: true
34-
default: "spot"
3526
target:
3627
description: "The target of benchmark, local or cloud or all"
3728
type: string
@@ -44,59 +35,53 @@ permissions:
4435

4536
env:
4637
BUILD_PROFILE: release
47-
RUNNER_PROVIDER: ${{ inputs.runner_provider }}
38+
RUNNER_PROVIDER: github
4839

4940
jobs:
50-
local:
51-
timeout-minutes: 60
52-
runs-on:
53-
- self-hosted
54-
- X64
55-
- Linux
56-
- 8c32g
57-
- ${{ inputs.runner_provider }}
58-
- ${{ inputs.runner_capacity }}
59-
strategy:
60-
matrix:
61-
dataset:
62-
- internal
63-
# - hits
64-
fail-fast: true
65-
max-parallel: 1
66-
steps:
67-
- uses: actions/checkout@v4
68-
if: inputs.source == 'release'
69-
with:
70-
ref: ${{ inputs.sha }}
71-
- uses: actions/checkout@v4
72-
if: inputs.source == 'pr'
73-
with:
74-
ref: "refs/pull/${{ inputs.source_id }}/merge"
75-
# - uses: ./.github/actions/setup_bendsql
76-
# - uses: ./.github/actions/setup_test
77-
# - name: Download artifact
78-
# uses: ./.github/actions/artifact_download
79-
# with:
80-
# sha: ${{ inputs.sha }}
81-
# target: x86_64-unknown-linux-gnu
82-
# category: full
83-
# artifacts: meta,query
84-
# - name: Setup Databend Binary
85-
# shell: bash
86-
# run: |
87-
# sudo cp ./target/release/databend-* /usr/local/bin/
88-
# databend-query --version
89-
# databend-meta --version
90-
# - uses: ./.github/actions/benchmark_local
91-
# if: inputs.target == 'local' || inputs.target == 'all'
92-
# timeout-minutes: 30
93-
# id: benchmark
94-
# with:
95-
# sha: ${{ inputs.sha }}
96-
# run_id: ${{ inputs.run_id }}
97-
# dataset: ${{ matrix.dataset }}
98-
# source: ${{ inputs.source }}
99-
# source_id: ${{ inputs.source_id }}
41+
# local:
42+
# timeout-minutes: 60
43+
# runs-on: ubuntu-latest
44+
# strategy:
45+
# matrix:
46+
# dataset:
47+
# - internal
48+
# # - hits
49+
# fail-fast: true
50+
# max-parallel: 1
51+
# steps:
52+
# - uses: actions/checkout@v4
53+
# if: inputs.source == 'release'
54+
# with:
55+
# ref: ${{ inputs.sha }}
56+
# - uses: actions/checkout@v4
57+
# if: inputs.source == 'pr'
58+
# with:
59+
# ref: "refs/pull/${{ inputs.source_id }}/merge"
60+
# - uses: ./.github/actions/setup_bendsql
61+
# - uses: ./.github/actions/setup_test
62+
# - name: Download artifact
63+
# uses: ./.github/actions/artifact_download
64+
# with:
65+
# sha: ${{ inputs.sha }}
66+
# target: x86_64-unknown-linux-gnu
67+
# category: full
68+
# artifacts: meta,query
69+
# - name: Setup Databend Binary
70+
# shell: bash
71+
# run: |
72+
# sudo cp ./target/release/databend-* /usr/local/bin/
73+
# databend-query --version
74+
# databend-meta --version
75+
# - uses: ./.github/actions/benchmark_local
76+
# if: inputs.target == 'local' || inputs.target == 'all'
77+
# timeout-minutes: 30
78+
# id: benchmark
79+
# with:
80+
# sha: ${{ inputs.sha }}
81+
# run_id: ${{ inputs.run_id }}
82+
# dataset: ${{ matrix.dataset }}
83+
# source: ${{ inputs.source }}
84+
# source_id: ${{ inputs.source_id }}
10085

10186
load:
10287
runs-on: ubuntu-latest
@@ -182,7 +167,7 @@ jobs:
182167
echo "DROP WAREHOUSE IF EXISTS 'benchmark-${{ inputs.run_id }}';" | bendsql -o table
183168
184169
comment:
185-
needs: [local, cloud]
170+
needs: [cloud]
186171
if: inputs.source == 'pr'
187172
runs-on: ubuntu-latest
188173
steps:
@@ -230,7 +215,7 @@ jobs:
230215
number: ${{ inputs.source_id }}
231216

232217
archive:
233-
needs: [local, cloud]
218+
needs: [cloud]
234219
if: inputs.source == 'release'
235220
runs-on: ubuntu-latest
236221
strategy:

0 commit comments

Comments
 (0)