Skip to content

Commit c7441ec

Browse files
authored
chore(ci): Use free OSS 4 vCPU runners (#19683)
* Update Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com> * Clean up disk space Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com> * Clear disk space for misc workflow Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com> * leave node_modules Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com> * clean more disk space Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com> --------- Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
1 parent b5de16c commit c7441ec

7 files changed

+135
-8
lines changed

.github/workflows/ci-integration-review.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
integration-tests:
8383
needs: prep-pr
84-
runs-on: ubuntu-20.04-4core
84+
runs-on: ubuntu-20.04
8585
timeout-minutes: 90
8686
steps:
8787
- uses: actions/checkout@v4

.github/workflows/integration-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ env:
3030

3131
jobs:
3232
test-integration:
33-
runs-on: ubuntu-20.04-4core
33+
runs-on: ubuntu-20.04
3434
timeout-minutes: 40
3535
if: inputs.if || github.event_name == 'workflow_dispatch'
3636
steps:

.github/workflows/integration.yml

+70-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
integration-tests:
5050
name: Integration Tests
51-
runs-on: ubuntu-20.04-4core
51+
runs-on: ubuntu-20.04
5252
needs: changes
5353
if: always() && (
5454
github.event_name == 'merge_group' || (
@@ -97,6 +97,7 @@ jobs:
9797

9898
- run: sudo npm -g install @datadog/datadog-ci
9999

100+
- run: sudo -E bash scripts/ci-free-disk-space.sh
100101
- run: docker image prune -af ; docker container prune -f
101102

102103
- name: Determine if secrets are defined (PR author is team member).
@@ -110,6 +111,8 @@ jobs:
110111
echo "PR_HAS_ACCESS_TO_SECRETS=false" >> "$GITHUB_ENV"
111112
fi
112113
114+
- run: docker image prune -af ; docker container prune -f
115+
113116
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.amqp == 'true' }}
114117
name: amqp
115118
uses: nick-fields/retry@v3
@@ -118,6 +121,8 @@ jobs:
118121
max_attempts: 3
119122
command: bash scripts/ci-int-e2e-test.sh int amqp
120123

124+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
125+
121126
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.appsignal == 'true') &&
122127
(github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
123128
name: appsignal
@@ -127,6 +132,8 @@ jobs:
127132
max_attempts: 3
128133
command: bash scripts/ci-int-e2e-test.sh int appsignal
129134

135+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
136+
130137
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.aws == 'true' }}
131138
name: aws
132139
uses: nick-fields/retry@v3
@@ -135,6 +142,8 @@ jobs:
135142
max_attempts: 3
136143
command: bash scripts/ci-int-e2e-test.sh int aws
137144

145+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
146+
138147
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.axiom == 'true') &&
139148
(github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
140149
name: axiom
@@ -144,6 +153,8 @@ jobs:
144153
max_attempts: 3
145154
command: bash scripts/ci-int-e2e-test.sh int axiom
146155

156+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
157+
147158
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.azure == 'true' }}
148159
name: azure
149160
uses: nick-fields/retry@v3
@@ -152,6 +163,8 @@ jobs:
152163
max_attempts: 3
153164
command: bash scripts/ci-int-e2e-test.sh int azure
154165

166+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
167+
155168
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.clickhouse == 'true' }}
156169
name: clickhouse
157170
uses: nick-fields/retry@v3
@@ -160,6 +173,8 @@ jobs:
160173
max_attempts: 3
161174
command: bash scripts/ci-int-e2e-test.sh int clickhouse
162175

176+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
177+
163178
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.databend == 'true') &&
164179
(github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
165180
name: databend
@@ -169,6 +184,8 @@ jobs:
169184
max_attempts: 3
170185
command: bash scripts/ci-int-e2e-test.sh int databend
171186

187+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
188+
172189
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog-agent == 'true') &&
173190
(github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
174191
name: datadog-agent
@@ -178,6 +195,8 @@ jobs:
178195
max_attempts: 3
179196
command: bash scripts/ci-int-e2e-test.sh int datadog-agent
180197

198+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
199+
181200
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog-logs == 'true') &&
182201
(github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
183202
name: datadog-logs
@@ -198,6 +217,8 @@ jobs:
198217
max_attempts: 3
199218
command: bash scripts/ci-int-e2e-test.sh int datadog-metrics
200219

220+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
221+
201222
- if: (github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.datadog-traces == 'true') &&
202223
(github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
203224
name: datadog-traces
@@ -207,6 +228,8 @@ jobs:
207228
max_attempts: 3
208229
command: bash scripts/ci-int-e2e-test.sh int datadog-traces
209230

231+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
232+
210233
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.dnstap == 'true' }}
211234
name: dnstap
212235
uses: nick-fields/retry@v3
@@ -215,6 +238,8 @@ jobs:
215238
max_attempts: 3
216239
command: bash scripts/ci-int-e2e-test.sh int dnstap
217240

241+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
242+
218243
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.docker-logs == 'true' }}
219244
name: docker-logs
220245
uses: nick-fields/retry@v3
@@ -223,6 +248,8 @@ jobs:
223248
max_attempts: 3
224249
command: bash scripts/ci-int-e2e-test.sh int docker-logs
225250

251+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
252+
226253
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.elasticsearch == 'true' }}
227254
name: elasticsearch
228255
uses: nick-fields/retry@v3
@@ -231,6 +258,8 @@ jobs:
231258
max_attempts: 3
232259
command: bash scripts/ci-int-e2e-test.sh int elasticsearch
233260

261+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
262+
234263
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.eventstoredb == 'true' }}
235264
name: eventstoredb
236265
uses: nick-fields/retry@v3
@@ -239,6 +268,8 @@ jobs:
239268
max_attempts: 3
240269
command: bash scripts/ci-int-e2e-test.sh int eventstoredb
241270

271+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
272+
242273
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.fluent == 'true' }}
243274
name: fluent
244275
uses: nick-fields/retry@v3
@@ -247,6 +278,8 @@ jobs:
247278
max_attempts: 3
248279
command: bash scripts/ci-int-e2e-test.sh int fluent
249280

281+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
282+
250283
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.gcp == 'true' }}
251284
name: gcp
252285
uses: nick-fields/retry@v3
@@ -255,6 +288,8 @@ jobs:
255288
max_attempts: 3
256289
command: bash scripts/ci-int-e2e-test.sh int gcp
257290

291+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
292+
258293
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.greptimedb == 'true' }}
259294
name: greptimedb
260295
uses: nick-fields/retry@v3
@@ -273,6 +308,8 @@ jobs:
273308
max_attempts: 3
274309
command: bash scripts/ci-int-e2e-test.sh int humio
275310

311+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
312+
276313
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.http-client == 'true' }}
277314
name: http-client
278315
uses: nick-fields/retry@v3
@@ -281,6 +318,8 @@ jobs:
281318
max_attempts: 3
282319
command: bash scripts/ci-int-e2e-test.sh int http-client
283320

321+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
322+
284323
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.influxdb == 'true' }}
285324
name: influxdb
286325
uses: nick-fields/retry@v3
@@ -289,6 +328,8 @@ jobs:
289328
max_attempts: 3
290329
command: bash scripts/ci-int-e2e-test.sh int influxdb
291330

331+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
332+
292333
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.kafka == 'true' }}
293334
name: kafka
294335
uses: nick-fields/retry@v3
@@ -297,6 +338,8 @@ jobs:
297338
max_attempts: 3
298339
command: bash scripts/ci-int-e2e-test.sh int kafka
299340

341+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
342+
300343
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.logstash == 'true' }}
301344
name: logstash
302345
uses: nick-fields/retry@v3
@@ -305,6 +348,8 @@ jobs:
305348
max_attempts: 3
306349
command: bash scripts/ci-int-e2e-test.sh int logstash
307350

351+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
352+
308353
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.loki == 'true' }}
309354
name: loki
310355
uses: nick-fields/retry@v3
@@ -313,6 +358,8 @@ jobs:
313358
max_attempts: 3
314359
command: bash scripts/ci-int-e2e-test.sh int loki
315360

361+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
362+
316363
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.mongodb == 'true' }}
317364
name: mongodb
318365
uses: nick-fields/retry@v3
@@ -321,6 +368,8 @@ jobs:
321368
max_attempts: 3
322369
command: bash scripts/ci-int-e2e-test.sh int mongodb
323370

371+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
372+
324373
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.mqtt == 'true' }}
325374
name: mqtt
326375
uses: nick-fields/retry@v3
@@ -329,6 +378,8 @@ jobs:
329378
max_attempts: 3
330379
command: bash scripts/ci-int-e2e-test.sh int mqtt
331380

381+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
382+
332383
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.nats == 'true' }}
333384
name: nats
334385
uses: nick-fields/retry@v3
@@ -337,6 +388,8 @@ jobs:
337388
max_attempts: 3
338389
command: bash scripts/ci-int-e2e-test.sh int nats
339390

391+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
392+
340393
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.nginx == 'true' }}
341394
name: nginx
342395
uses: nick-fields/retry@v3
@@ -355,6 +408,8 @@ jobs:
355408
max_attempts: 3
356409
command: bash scripts/ci-int-e2e-test.sh int opentelemetry
357410

411+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
412+
358413
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.postgres == 'true' }}
359414
name: postgres
360415
uses: nick-fields/retry@v3
@@ -363,6 +418,8 @@ jobs:
363418
max_attempts: 3
364419
command: bash scripts/ci-int-e2e-test.sh int postgres
365420

421+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
422+
366423
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.prometheus == 'true' }}
367424
name: prometheus
368425
uses: nick-fields/retry@v3
@@ -371,6 +428,8 @@ jobs:
371428
max_attempts: 3
372429
command: bash scripts/ci-int-e2e-test.sh int prometheus
373430

431+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
432+
374433
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.pulsar == 'true' }}
375434
name: pulsar
376435
uses: nick-fields/retry@v3
@@ -379,6 +438,8 @@ jobs:
379438
max_attempts: 3
380439
command: bash scripts/ci-int-e2e-test.sh int pulsar
381440

441+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
442+
382443
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.redis == 'true' }}
383444
name: redis
384445
uses: nick-fields/retry@v3
@@ -387,6 +448,8 @@ jobs:
387448
max_attempts: 3
388449
command: bash scripts/ci-int-e2e-test.sh int redis
389450

451+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
452+
390453
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' }}
391454
name: shutdown
392455
uses: nick-fields/retry@v3
@@ -395,6 +458,8 @@ jobs:
395458
max_attempts: 3
396459
command: bash scripts/ci-int-e2e-test.sh int shutdown
397460

461+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
462+
398463
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.splunk == 'true' }}
399464
name: splunk
400465
uses: nick-fields/retry@v3
@@ -403,6 +468,8 @@ jobs:
403468
max_attempts: 3
404469
command: bash scripts/ci-int-e2e-test.sh int splunk
405470

471+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
472+
406473
- if: ${{ github.event_name == 'merge_group' || needs.changes.outputs.all-int == 'true' || needs.changes.outputs.webhdfs == 'true' }}
407474
name: webhdfs
408475
uses: nick-fields/retry@v3
@@ -411,6 +478,8 @@ jobs:
411478
max_attempts: 3
412479
command: bash scripts/ci-int-e2e-test.sh int webhdfs
413480

481+
- run: docker image prune -af --filter=label!=vector-test-runner=true ; docker container prune -f
482+
414483
integration-test-suite:
415484
name: Integration Test Suite
416485
runs-on: ubuntu-latest

.github/workflows/k8s_e2e.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
build-x86_64-unknown-linux-gnu:
6161
name: Build - x86_64-unknown-linux-gnu
62-
runs-on: ubuntu-20.04-4core
62+
runs-on: ubuntu-20.04
6363
timeout-minutes: 45
6464
needs: changes
6565
# Run this job even if `changes` job is skipped (non- pull request trigger)
@@ -176,7 +176,7 @@ jobs:
176176

177177
test-e2e-kubernetes:
178178
name: K8s ${{ matrix.kubernetes_version.version }} / ${{ matrix.container_runtime }} (${{ matrix.kubernetes_version.role }})
179-
runs-on: ubuntu-20.04-4core
179+
runs-on: ubuntu-20.04
180180
timeout-minutes: 45
181181
needs:
182182
- build-x86_64-unknown-linux-gnu

.github/workflows/misc.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
test-misc:
8-
runs-on: ubuntu-20.04-4core
8+
runs-on: ubuntu-20.04
99
timeout-minutes: 60
1010
env:
1111
CARGO_INCREMENTAL: 0
@@ -41,6 +41,7 @@ jobs:
4141
restore-keys: |
4242
${{ runner.os }}-cargo-
4343
44+
- run: sudo -E bash scripts/ci-free-disk-space.sh
4445
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
4546
- run: bash scripts/environment/prepare.sh
4647
- run: echo "::add-matcher::.github/matchers/rust.json"

.github/workflows/regression.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ jobs:
184184

185185
build-baseline:
186186
name: Build baseline Vector container
187-
runs-on: ubuntu-20.04-4core
187+
runs-on: ubuntu-20.04
188188
timeout-minutes: 30
189189
needs:
190190
- should-run-gate
@@ -223,7 +223,7 @@ jobs:
223223

224224
build-comparison:
225225
name: Build comparison Vector container
226-
runs-on: ubuntu-20.04-4core
226+
runs-on: ubuntu-20.04
227227
timeout-minutes: 30
228228
needs:
229229
- should-run-gate

0 commit comments

Comments
 (0)