Skip to content

Commit e9d64af

Browse files
pchilamergify[bot]
authored andcommitted
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
1 parent d0f42fd commit e9d64af

File tree

1 file changed

+66
-35
lines changed

1 file changed

+66
-35
lines changed

.buildkite/bk.integration.pipeline.yml

Lines changed: 66 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,41 @@ 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

7777

7878
steps:
79+
<<<<<<< HEAD
80+
=======
81+
- label: "Custom ECH Testing"
82+
key: integration-tests-ech
83+
depends_on:
84+
- packaging-containers-amd64
85+
- packaging-containers-arm64
86+
env:
87+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
88+
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud:git-${BUILDKITE_COMMIT:0:12}"
89+
FORCE_ESS_CREATE: "true"
90+
command: |
91+
#!/usr/bin/env bash
92+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
93+
.buildkite/scripts/steps/integration_tests_tf.sh ech true
94+
artifact_paths:
95+
- build/*
96+
- build/diagnostics/**
97+
retry:
98+
automatic:
99+
limit: 1
100+
agents:
101+
provider: "gcp"
102+
machineType: "n2-standard-8"
103+
image: "${IMAGE_UBUNTU_2404_X86_64}"
104+
plugins:
105+
- *vault_ec_key_prod
106+
107+
>>>>>>> 3cedabfc0 (Avoid downloading/uploading unnecessary artifacts in CI runs (#11327))
79108
- label: Start ESS stack for integration tests
80109
key: integration-ess
81110
notify:
@@ -108,10 +137,10 @@ steps:
108137
env:
109138
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/leak"
110139
command: |
111-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
140+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
112141
.buildkite/scripts/steps/integration_tests_tf.ps1 fleet true
113142
artifact_paths:
114-
- build/**
143+
- build/*
115144
- build/diagnostics/**
116145
agents:
117146
provider: "gcp"
@@ -129,10 +158,10 @@ steps:
129158
env:
130159
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/leak"
131160
command: |
132-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
161+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
133162
.buildkite/scripts/steps/integration_tests_tf.ps1 fleet true
134163
artifact_paths:
135-
- build/**
164+
- build/*
136165
- build/diagnostics/**
137166
retry:
138167
automatic:
@@ -149,10 +178,10 @@ steps:
149178
env:
150179
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/leak"
151180
command: |
152-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
181+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
153182
.buildkite/scripts/steps/integration_tests_tf.sh fleet true
154183
artifact_paths:
155-
- build/**
184+
- build/*
156185
- build/diagnostics/**
157186
retry:
158187
automatic:
@@ -178,10 +207,10 @@ steps:
178207
env:
179208
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
180209
command: |
181-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
210+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
182211
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
183212
artifact_paths:
184-
- build/**
213+
- build/*
185214
- build/diagnostics/**
186215
agents:
187216
provider: "gcp"
@@ -208,10 +237,10 @@ steps:
208237
env:
209238
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
210239
command: |
211-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
240+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
212241
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
213242
artifact_paths:
214-
- build/**
243+
- build/*
215244
- build/diagnostics/**
216245
agents:
217246
provider: "gcp"
@@ -231,10 +260,10 @@ steps:
231260
env:
232261
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
233262
command: |
234-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
263+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
235264
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
236265
artifact_paths:
237-
- build/**
266+
- build/*
238267
- build/diagnostics/**
239268
agents:
240269
provider: "gcp"
@@ -261,10 +290,10 @@ steps:
261290
env:
262291
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
263292
command: |
264-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
293+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
265294
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
266295
artifact_paths:
267-
- build/**
296+
- build/*
268297
- build/diagnostics/**
269298
retry:
270299
automatic:
@@ -291,10 +320,10 @@ steps:
291320
env:
292321
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
293322
command: |
294-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
323+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
295324
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
296325
artifact_paths:
297-
- build/**
326+
- build/*
298327
- build/diagnostics/**
299328
retry:
300329
automatic:
@@ -315,10 +344,11 @@ steps:
315344
env:
316345
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
317346
command: |
318-
buildkite-agent artifact download build/distributions/** . --step packaging-amd64
347+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step packaging-amd64
348+
buildkite-agent artifact download build/distributions/elastic-agent-*-amd64.deb* . --step packaging-amd64
319349
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
320350
artifact_paths:
321-
- build/**
351+
- build/*
322352
- build/diagnostics/**
323353
retry:
324354
automatic:
@@ -351,10 +381,10 @@ steps:
351381
env:
352382
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
353383
command: |
354-
buildkite-agent artifact download build/distributions/** . --step 'packaging-arm64'
384+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-arm64* . --step 'packaging-arm64'
355385
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
356386
artifact_paths:
357-
- build/**
387+
- build/*
358388
- build/diagnostics/**
359389
agents:
360390
provider: "aws"
@@ -389,10 +419,10 @@ steps:
389419
env:
390420
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
391421
command: |
392-
buildkite-agent artifact download build/distributions/** . --step 'packaging-arm64'
422+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-arm64* . --step 'packaging-arm64'
393423
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
394424
artifact_paths:
395-
- build/**
425+
- build/*
396426
- build/diagnostics/**
397427
retry:
398428
automatic:
@@ -419,10 +449,10 @@ steps:
419449
env:
420450
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
421451
command: |
422-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
452+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
423453
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.group}} false
424454
artifact_paths:
425-
- build/**
455+
- build/*
426456
- build/diagnostics/**
427457
retry:
428458
automatic:
@@ -448,10 +478,11 @@ steps:
448478
env:
449479
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
450480
command: |
451-
buildkite-agent artifact download build/distributions/** . --step packaging-amd64
481+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step packaging-amd64
482+
buildkite-agent artifact download build/distributions/elastic-agent-*-amd64.deb* . --step packaging-amd64
452483
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.group}} true
453484
artifact_paths:
454-
- build/**
485+
- build/*
455486
- build/diagnostics/**
456487
retry:
457488
automatic:
@@ -498,10 +529,10 @@ steps:
498529
env:
499530
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
500531
command: |
501-
buildkite-agent artifact download build/distributions/** . --step packaging-amd64
532+
buildkite-agent artifact download build/distributions/elastic-agent-*-x86_64.rpm* . --step packaging-amd64
502533
.buildkite/scripts/steps/integration_tests_tf.sh rpm true
503534
artifact_paths:
504-
- build/**
535+
- build/*
505536
- build/diagnostics/**
506537
retry:
507538
automatic:
@@ -598,10 +629,10 @@ steps:
598629
env:
599630
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/serverless"
600631
command: |
601-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
632+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
602633
.buildkite/scripts/buildkite-integration-tests.ps1 fleet true
603634
artifact_paths:
604-
- build/**
635+
- build/*
605636
- build/diagnostics/**
606637
retry:
607638
automatic:
@@ -620,10 +651,10 @@ steps:
620651
env:
621652
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/serverless"
622653
command: |
623-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
654+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
624655
.buildkite/scripts/buildkite-integration-tests.ps1 fleet true
625656
artifact_paths:
626-
- build/**
657+
- build/*
627658
- build/diagnostics/**
628659
retry:
629660
automatic:
@@ -640,10 +671,10 @@ steps:
640671
env:
641672
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/serverless"
642673
command: |
643-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
674+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
644675
sudo -E .buildkite/scripts/buildkite-integration-tests.sh fleet true
645676
artifact_paths:
646-
- build/**
677+
- build/*
647678
- build/diagnostics/**
648679
retry:
649680
automatic:

0 commit comments

Comments
 (0)