Skip to content

Commit d63a2ff

Browse files
mergify[bot]pchila
andauthored
[9.1] (backport #11327) Avoid downloading/uploading unnecessary artifacts in CI runs (#11345)
* Avoid downloading/uploading unnecessary artifacts in CI runs (#11327) * avoid uploading the whole build/ directory tree * Download only required artifacts for integration tests (cherry picked from commit 3cedabf) # Conflicts: # .buildkite/bk.integration.pipeline.yml * fix conflicts --------- Co-authored-by: Paolo Chilà <[email protected]>
1 parent c6c4746 commit d63a2ff

File tree

1 file changed

+37
-35
lines changed

1 file changed

+37
-35
lines changed

.buildkite/bk.integration.pipeline.yml

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ common:
7070
buildkite-agent artifact download build/distributions/*-linux-amd64.docker.tar.gz . --step 'packaging-containers-amd64'
7171
.buildkite/scripts/steps/integration_tests_tf.sh kubernetes false
7272
artifact_paths: &k8s_test_artifact_paths
73-
- build/**
73+
- build/*
7474
- build/diagnostics/**
7575
- build/*.pod_logs_dump/*
7676

@@ -108,10 +108,10 @@ steps:
108108
env:
109109
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/leak"
110110
command: |
111-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
111+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
112112
.buildkite/scripts/steps/integration_tests_tf.ps1 fleet true
113113
artifact_paths:
114-
- build/**
114+
- build/*
115115
- build/diagnostics/**
116116
agents:
117117
provider: "gcp"
@@ -129,10 +129,10 @@ steps:
129129
env:
130130
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/leak"
131131
command: |
132-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
132+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
133133
.buildkite/scripts/steps/integration_tests_tf.ps1 fleet true
134134
artifact_paths:
135-
- build/**
135+
- build/*
136136
- build/diagnostics/**
137137
retry:
138138
automatic:
@@ -149,10 +149,10 @@ steps:
149149
env:
150150
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/leak"
151151
command: |
152-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
152+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
153153
.buildkite/scripts/steps/integration_tests_tf.sh fleet true
154154
artifact_paths:
155-
- build/**
155+
- build/*
156156
- build/diagnostics/**
157157
retry:
158158
automatic:
@@ -178,10 +178,10 @@ steps:
178178
env:
179179
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
180180
command: |
181-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
181+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
182182
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
183183
artifact_paths:
184-
- build/**
184+
- build/*
185185
- build/diagnostics/**
186186
agents:
187187
provider: "gcp"
@@ -208,10 +208,10 @@ steps:
208208
env:
209209
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
210210
command: |
211-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
211+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
212212
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
213213
artifact_paths:
214-
- build/**
214+
- build/*
215215
- build/diagnostics/**
216216
agents:
217217
provider: "gcp"
@@ -231,10 +231,10 @@ steps:
231231
env:
232232
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
233233
command: |
234-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
234+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
235235
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
236236
artifact_paths:
237-
- build/**
237+
- build/*
238238
- build/diagnostics/**
239239
agents:
240240
provider: "gcp"
@@ -261,10 +261,10 @@ steps:
261261
env:
262262
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
263263
command: |
264-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
264+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
265265
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
266266
artifact_paths:
267-
- build/**
267+
- build/*
268268
- build/diagnostics/**
269269
retry:
270270
automatic:
@@ -291,10 +291,10 @@ steps:
291291
env:
292292
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
293293
command: |
294-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
294+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
295295
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
296296
artifact_paths:
297-
- build/**
297+
- build/*
298298
- build/diagnostics/**
299299
retry:
300300
automatic:
@@ -315,10 +315,11 @@ steps:
315315
env:
316316
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
317317
command: |
318-
buildkite-agent artifact download build/distributions/** . --step packaging-amd64
318+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step packaging-amd64
319+
buildkite-agent artifact download build/distributions/elastic-agent-*-amd64.deb* . --step packaging-amd64
319320
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
320321
artifact_paths:
321-
- build/**
322+
- build/*
322323
- build/diagnostics/**
323324
retry:
324325
automatic:
@@ -351,10 +352,10 @@ steps:
351352
env:
352353
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
353354
command: |
354-
buildkite-agent artifact download build/distributions/** . --step 'packaging-arm64'
355+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-arm64* . --step 'packaging-arm64'
355356
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
356357
artifact_paths:
357-
- build/**
358+
- build/*
358359
- build/diagnostics/**
359360
agents:
360361
provider: "aws"
@@ -389,10 +390,10 @@ steps:
389390
env:
390391
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
391392
command: |
392-
buildkite-agent artifact download build/distributions/** . --step 'packaging-arm64'
393+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-arm64* . --step 'packaging-arm64'
393394
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
394395
artifact_paths:
395-
- build/**
396+
- build/*
396397
- build/diagnostics/**
397398
retry:
398399
automatic:
@@ -419,10 +420,10 @@ steps:
419420
env:
420421
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
421422
command: |
422-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
423+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
423424
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.group}} false
424425
artifact_paths:
425-
- build/**
426+
- build/*
426427
- build/diagnostics/**
427428
retry:
428429
automatic:
@@ -448,10 +449,11 @@ steps:
448449
env:
449450
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
450451
command: |
451-
buildkite-agent artifact download build/distributions/** . --step packaging-amd64
452+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step packaging-amd64
453+
buildkite-agent artifact download build/distributions/elastic-agent-*-amd64.deb* . --step packaging-amd64
452454
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.group}} true
453455
artifact_paths:
454-
- build/**
456+
- build/*
455457
- build/diagnostics/**
456458
retry:
457459
automatic:
@@ -498,10 +500,10 @@ steps:
498500
env:
499501
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
500502
command: |
501-
buildkite-agent artifact download build/distributions/** . --step packaging-amd64
503+
buildkite-agent artifact download build/distributions/elastic-agent-*-x86_64.rpm* . --step packaging-amd64
502504
.buildkite/scripts/steps/integration_tests_tf.sh rpm true
503505
artifact_paths:
504-
- build/**
506+
- build/*
505507
- build/diagnostics/**
506508
retry:
507509
automatic:
@@ -598,10 +600,10 @@ steps:
598600
env:
599601
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/serverless"
600602
command: |
601-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
603+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
602604
.buildkite/scripts/buildkite-integration-tests.ps1 fleet true
603605
artifact_paths:
604-
- build/**
606+
- build/*
605607
- build/diagnostics/**
606608
retry:
607609
automatic:
@@ -620,10 +622,10 @@ steps:
620622
env:
621623
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/serverless"
622624
command: |
623-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
625+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
624626
.buildkite/scripts/buildkite-integration-tests.ps1 fleet true
625627
artifact_paths:
626-
- build/**
628+
- build/*
627629
- build/diagnostics/**
628630
retry:
629631
automatic:
@@ -640,10 +642,10 @@ steps:
640642
env:
641643
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/serverless"
642644
command: |
643-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
645+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
644646
sudo -E .buildkite/scripts/buildkite-integration-tests.sh fleet true
645647
artifact_paths:
646-
- build/**
648+
- build/*
647649
- build/diagnostics/**
648650
retry:
649651
automatic:

0 commit comments

Comments
 (0)