Skip to content

Commit 2a3cc7f

Browse files
v1vv1v
committed
run faster
1 parent fa8f690 commit 2a3cc7f

File tree

3 files changed

+53
-52
lines changed

3 files changed

+53
-52
lines changed

‎.buildkite/bk.integration-fips.pipeline.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
3535
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
3636
command: |
37-
buildkite-agent artifact download build/distributions/elastic-agent-cloud-fips-*-linux-amd64.docker.tar.gz . --step 'packaging-containers-x86-64-fips'
37+
buildkite-agent artifact download build/distributions/elastic-agent-cloud-fips-*-linux-amd64.docker.tar.gz . --step 'packaging-containers-x86-64-fips' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
3838
mage cloud:load
3939
mage cloud:push
4040
agents:
@@ -76,7 +76,7 @@ steps:
7676
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
7777
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
7878
command: |
79-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64-fips'
79+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64-fips' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
8080
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.groups}} {{matrix.sudo}}
8181
artifact_paths:
8282
- build/**
@@ -110,7 +110,7 @@ steps:
110110
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
111111
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
112112
command: |
113-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64-fips'
113+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64-fips' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
114114
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.groups}} {{matrix.sudo}}
115115
artifact_paths:
116116
- build/**

‎.buildkite/bk.integration.pipeline.yml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ steps:
7272
steps:
7373
- label: "Windows:2022:amd64:sudo"
7474
skip: "Currently testing linux only"
75-
depends_on:
76-
- packaging-windows
75+
#depends_on:
76+
# - packaging-windows
7777
env:
7878
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/leak"
7979
command: |
80-
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
80+
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
8181
.buildkite/scripts/steps/integration_tests_tf.ps1 fleet true
8282
artifact_paths:
8383
- build/**
@@ -96,12 +96,12 @@ steps:
9696

9797
- label: "Windows:2025:amd64:sudo"
9898
skip: "Currently testing linux only"
99-
depends_on:
100-
- packaging-windows
99+
#depends_on:
100+
# - packaging-windows
101101
env:
102102
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/leak"
103103
command: |
104-
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
104+
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
105105
.buildkite/scripts/steps/integration_tests_tf.ps1 fleet true
106106
artifact_paths:
107107
- build/**
@@ -119,11 +119,11 @@ steps:
119119
- *vault_github_token
120120

121121
- label: "Ubuntu:2404:amd64:sudo"
122-
depends_on: packaging-ubuntu-x86-64
122+
#depends_on: packaging-ubuntu-x86-64
123123
env:
124124
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/leak"
125125
command: |
126-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
126+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
127127
.buildkite/scripts/steps/integration_tests_tf.sh fleet true
128128
artifact_paths:
129129
- build/**
@@ -150,12 +150,12 @@ steps:
150150
- integration-ess
151151
steps:
152152
- label: "Win2022:sudo:{{matrix}}"
153-
depends_on:
154-
- packaging-windows
153+
#depends_on:
154+
# - packaging-windows
155155
env:
156156
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
157157
command: |
158-
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
158+
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
159159
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
160160
artifact_paths:
161161
- build/**
@@ -182,12 +182,12 @@ steps:
182182
- *vault_github_token
183183

184184
- label: "Win2022:non-sudo:{{matrix}}"
185-
depends_on:
186-
- packaging-windows
185+
#depends_on:
186+
# - packaging-windows
187187
env:
188188
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
189189
command: |
190-
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
190+
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
191191
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
192192
artifact_paths:
193193
- build/**
@@ -207,12 +207,12 @@ steps:
207207
- *vault_github_token
208208

209209
- label: "Win2025:sudo:{{matrix}}"
210-
depends_on:
211-
- packaging-windows
210+
#depends_on:
211+
# - packaging-windows
212212
env:
213213
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
214214
command: |
215-
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
215+
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
216216
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
217217
artifact_paths:
218218
- build/**
@@ -239,12 +239,12 @@ steps:
239239
- *vault_github_token
240240

241241
- label: "Win2025:non-sudo:{{matrix}}"
242-
depends_on:
243-
- packaging-windows
242+
#depends_on:
243+
# - packaging-windows
244244
env:
245245
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
246246
command: |
247-
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
247+
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
248248
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
249249
artifact_paths:
250250
- build/**
@@ -272,11 +272,11 @@ steps:
272272
- integration-ess
273273
steps:
274274
- label: "x86_64:non-sudo: {{matrix}}"
275-
depends_on: packaging-ubuntu-x86-64
275+
#depends_on: packaging-ubuntu-x86-64
276276
env:
277277
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
278278
command: |
279-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
279+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
280280
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
281281
artifact_paths:
282282
- build/**
@@ -296,13 +296,13 @@ steps:
296296
- *vault_github_token
297297

298298
- label: "x86_64:sudo: {{matrix}}"
299-
depends_on:
300-
- packaging-ubuntu-x86-64
299+
#depends_on:
300+
# - packaging-ubuntu-x86-64
301301
# due to deb group present in matrix tar.gz and deb packages artifacts are required
302302
env:
303303
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
304304
command: |
305-
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
305+
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64 --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
306306
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
307307
artifact_paths:
308308
- build/**
@@ -335,12 +335,12 @@ steps:
335335
- *vault_github_token
336336

337337
- label: "arm:sudo: {{matrix}}"
338-
depends_on:
339-
- packaging-ubuntu-arm64
338+
#depends_on:
339+
# - packaging-ubuntu-arm64
340340
env:
341341
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
342342
command: |
343-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64'
343+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
344344
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
345345
artifact_paths:
346346
- build/**
@@ -375,12 +375,12 @@ steps:
375375

376376
- label: "arm:non-sudo: {{matrix}}"
377377
skip: true
378-
depends_on:
379-
- packaging-ubuntu-arm64
378+
#depends_on:
379+
# - packaging-ubuntu-arm64
380380
env:
381381
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
382382
command: |
383-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64'
383+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
384384
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
385385
artifact_paths:
386386
- build/**
@@ -408,11 +408,11 @@ steps:
408408
- integration-ess
409409
steps:
410410
- label: "x86_64:non-sudo: {{matrix}}"
411-
depends_on: packaging-ubuntu-x86-64
411+
#depends_on: packaging-ubuntu-x86-64
412412
env:
413413
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
414414
command: |
415-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
415+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
416416
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
417417
artifact_paths:
418418
- build/**
@@ -432,13 +432,13 @@ steps:
432432
- *vault_github_token
433433

434434
- label: "x86_64:sudo: {{matrix}}"
435-
depends_on:
436-
- packaging-ubuntu-x86-64
435+
#depends_on:
436+
# - packaging-ubuntu-x86-64
437437
# due to deb group present in matrix tar.gz and deb packages artifacts are required
438438
env:
439439
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
440440
command: |
441-
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
441+
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64 --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
442442
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
443443
artifact_paths:
444444
- build/**
@@ -480,12 +480,12 @@ steps:
480480
- integration-ess
481481
steps:
482482
- label: "x86_64:sudo:rpm"
483-
depends_on:
484-
- packaging-ubuntu-x86-64
483+
#depends_on:
484+
# - packaging-ubuntu-x86-64
485485
env:
486486
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
487487
command: |
488-
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
488+
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64 --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
489489
.buildkite/scripts/steps/integration_tests_tf.sh rpm true
490490
artifact_paths:
491491
- build/**
@@ -509,7 +509,7 @@ steps:
509509
context: "buildkite/elastic-agent-extended-testing - Kubernetes"
510510
depends_on:
511511
- integration-ess
512-
- packaging-containers-x86-64
512+
# - packaging-containers-x86-64
513513
steps:
514514
- label: "{{matrix.version}}:amd64:{{matrix.variants}}"
515515
env:
@@ -518,7 +518,7 @@ steps:
518518
DOCKER_VARIANTS: "{{matrix.variants}}"
519519
TARGET_ARCH: "amd64"
520520
command: |
521-
buildkite-agent artifact download build/distributions/*-linux-amd64.docker.tar.gz . --step 'packaging-containers-x86-64'
521+
buildkite-agent artifact download build/distributions/*-linux-amd64.docker.tar.gz . --step 'packaging-containers-x86-64' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
522522
.buildkite/scripts/steps/integration_tests_tf.sh kubernetes false
523523
artifact_paths:
524524
- build/**
@@ -562,12 +562,12 @@ steps:
562562
context: "buildkite/elastic-agent-extended-testing - Serverless integration test"
563563
steps:
564564
- label: "Windows:2022:amd64:sudo"
565-
depends_on:
566-
- packaging-windows
565+
#depends_on:
566+
# - packaging-windows
567567
env:
568568
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/serverless"
569569
command: |
570-
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
570+
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
571571
.buildkite/scripts/buildkite-integration-tests.ps1 fleet true
572572
artifact_paths:
573573
- build/**
@@ -584,12 +584,12 @@ steps:
584584
- *gcp_serverless_secrets_plugin
585585

586586
- label: "Windows:2025:amd64:sudo"
587-
depends_on:
588-
- packaging-windows
587+
#depends_on:
588+
# - packaging-windows
589589
env:
590590
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/serverless"
591591
command: |
592-
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
592+
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
593593
.buildkite/scripts/buildkite-integration-tests.ps1 fleet true
594594
artifact_paths:
595595
- build/**
@@ -605,11 +605,11 @@ steps:
605605
- *google_oidc_plugin
606606
- *gcp_serverless_secrets_plugin
607607
- label: "Ubuntu:2404:amd64:sudo"
608-
depends_on: packaging-ubuntu-x86-64
608+
#depends_on: packaging-ubuntu-x86-64
609609
env:
610610
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/serverless"
611611
command: |
612-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
612+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64' --build 0197d98b-cb36-4c75-a121-7e4368a11d4c
613613
sudo -E .buildkite/scripts/buildkite-integration-tests.sh fleet true
614614
artifact_paths:
615615
- build/**

‎.buildkite/integration.pipeline.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ env:
55

66
steps:
77
- group: "Integration tests: packaging"
8+
skip: "Currently using a previous build"
89
key: "int-packaging"
910
notify:
1011
- github_commit_status:

0 commit comments

Comments
 (0)