Skip to content

Commit a486e88

Browse files
btriegerbtrieger
committed
Merge remote-tracking branch 'origin/main' into logstash-helm-output
2 parents 032d447 + 786c3e5 commit a486e88

File tree

197 files changed

+11074
-7920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+11074
-7920
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ steps:
5454
FIPS: "true"
5555
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
5656
ESS_REGION: "us-gov-east-1"
57+
TF_VAR_deployment_template_id: "aws-general-purpose"
5758
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
59+
TF_VAR_docker_images_name_suffix: "-fips"
5860
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
5961
command: |
6062
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64-fips'
@@ -86,7 +88,9 @@ steps:
8688
FIPS: "true"
8789
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
8890
ESS_REGION: "us-gov-east-1"
91+
TF_VAR_deployment_template_id: "aws-general-purpose"
8992
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
93+
TF_VAR_docker_images_name_suffix: "-fips"
9094
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
9195
command: |
9296
buildkite-agent artifact download build/distributions/** . --step 'packaging-arm64-fips'

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

Lines changed: 39 additions & 37 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

@@ -87,10 +87,10 @@ steps:
8787
FORCE_ESS_CREATE: "true"
8888
command: |
8989
#!/usr/bin/env bash
90-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
90+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
9191
.buildkite/scripts/steps/integration_tests_tf.sh ech true
9292
artifact_paths:
93-
- build/**
93+
- build/*
9494
- build/diagnostics/**
9595
retry:
9696
automatic:
@@ -134,10 +134,10 @@ steps:
134134
env:
135135
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/leak"
136136
command: |
137-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
137+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
138138
.buildkite/scripts/steps/integration_tests_tf.ps1 fleet true
139139
artifact_paths:
140-
- build/**
140+
- build/*
141141
- build/diagnostics/**
142142
agents:
143143
provider: "gcp"
@@ -155,10 +155,10 @@ steps:
155155
env:
156156
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/leak"
157157
command: |
158-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
158+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
159159
.buildkite/scripts/steps/integration_tests_tf.ps1 fleet true
160160
artifact_paths:
161-
- build/**
161+
- build/*
162162
- build/diagnostics/**
163163
retry:
164164
automatic:
@@ -175,10 +175,10 @@ steps:
175175
env:
176176
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/leak"
177177
command: |
178-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
178+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
179179
.buildkite/scripts/steps/integration_tests_tf.sh fleet true
180180
artifact_paths:
181-
- build/**
181+
- build/*
182182
- build/diagnostics/**
183183
retry:
184184
automatic:
@@ -204,10 +204,10 @@ steps:
204204
env:
205205
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
206206
command: |
207-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
207+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
208208
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
209209
artifact_paths:
210-
- build/**
210+
- build/*
211211
- build/diagnostics/**
212212
agents:
213213
provider: "gcp"
@@ -234,10 +234,10 @@ steps:
234234
env:
235235
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
236236
command: |
237-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
237+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
238238
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
239239
artifact_paths:
240-
- build/**
240+
- build/*
241241
- build/diagnostics/**
242242
agents:
243243
provider: "gcp"
@@ -257,10 +257,10 @@ steps:
257257
env:
258258
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
259259
command: |
260-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
260+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
261261
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
262262
artifact_paths:
263-
- build/**
263+
- build/*
264264
- build/diagnostics/**
265265
agents:
266266
provider: "gcp"
@@ -287,10 +287,10 @@ steps:
287287
env:
288288
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
289289
command: |
290-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
290+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
291291
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
292292
artifact_paths:
293-
- build/**
293+
- build/*
294294
- build/diagnostics/**
295295
retry:
296296
automatic:
@@ -317,10 +317,10 @@ steps:
317317
env:
318318
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
319319
command: |
320-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
320+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
321321
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
322322
artifact_paths:
323-
- build/**
323+
- build/*
324324
- build/diagnostics/**
325325
retry:
326326
automatic:
@@ -341,10 +341,11 @@ steps:
341341
env:
342342
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
343343
command: |
344-
buildkite-agent artifact download build/distributions/** . --step packaging-amd64
344+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step packaging-amd64
345+
buildkite-agent artifact download build/distributions/elastic-agent-*-amd64.deb* . --step packaging-amd64
345346
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
346347
artifact_paths:
347-
- build/**
348+
- build/*
348349
- build/diagnostics/**
349350
retry:
350351
automatic:
@@ -377,10 +378,10 @@ steps:
377378
env:
378379
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
379380
command: |
380-
buildkite-agent artifact download build/distributions/** . --step 'packaging-arm64'
381+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-arm64* . --step 'packaging-arm64'
381382
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
382383
artifact_paths:
383-
- build/**
384+
- build/*
384385
- build/diagnostics/**
385386
agents:
386387
provider: "aws"
@@ -415,10 +416,10 @@ steps:
415416
env:
416417
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
417418
command: |
418-
buildkite-agent artifact download build/distributions/** . --step 'packaging-arm64'
419+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-arm64* . --step 'packaging-arm64'
419420
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
420421
artifact_paths:
421-
- build/**
422+
- build/*
422423
- build/diagnostics/**
423424
retry:
424425
automatic:
@@ -445,10 +446,10 @@ steps:
445446
env:
446447
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
447448
command: |
448-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
449+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
449450
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.group}} false
450451
artifact_paths:
451-
- build/**
452+
- build/*
452453
- build/diagnostics/**
453454
retry:
454455
automatic:
@@ -474,10 +475,11 @@ steps:
474475
env:
475476
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
476477
command: |
477-
buildkite-agent artifact download build/distributions/** . --step packaging-amd64
478+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step packaging-amd64
479+
buildkite-agent artifact download build/distributions/elastic-agent-*-amd64.deb* . --step packaging-amd64
478480
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.group}} true
479481
artifact_paths:
480-
- build/**
482+
- build/*
481483
- build/diagnostics/**
482484
retry:
483485
automatic:
@@ -524,10 +526,10 @@ steps:
524526
env:
525527
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
526528
command: |
527-
buildkite-agent artifact download build/distributions/** . --step packaging-amd64
529+
buildkite-agent artifact download build/distributions/elastic-agent-*-x86_64.rpm* . --step packaging-amd64
528530
.buildkite/scripts/steps/integration_tests_tf.sh rpm true
529531
artifact_paths:
530-
- build/**
532+
- build/*
531533
- build/diagnostics/**
532534
retry:
533535
automatic:
@@ -624,10 +626,10 @@ steps:
624626
env:
625627
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/serverless"
626628
command: |
627-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
629+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
628630
.buildkite/scripts/buildkite-integration-tests.ps1 fleet true
629631
artifact_paths:
630-
- build/**
632+
- build/*
631633
- build/diagnostics/**
632634
retry:
633635
automatic:
@@ -646,10 +648,10 @@ steps:
646648
env:
647649
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/serverless"
648650
command: |
649-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
651+
buildkite-agent artifact download build/distributions/elastic-agent-*-windows-x86_64* . --step 'packaging-amd64'
650652
.buildkite/scripts/buildkite-integration-tests.ps1 fleet true
651653
artifact_paths:
652-
- build/**
654+
- build/*
653655
- build/diagnostics/**
654656
retry:
655657
automatic:
@@ -666,10 +668,10 @@ steps:
666668
env:
667669
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/serverless"
668670
command: |
669-
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64'
671+
buildkite-agent artifact download build/distributions/elastic-agent-*-linux-x86_64* . --step 'packaging-amd64'
670672
sudo -E .buildkite/scripts/buildkite-integration-tests.sh fleet true
671673
artifact_paths:
672-
- build/**
674+
- build/*
673675
- build/diagnostics/**
674676
retry:
675677
automatic:

‎.buildkite/integration.pipeline.yml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ env:
44
VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
55
ASDF_MAGE_VERSION: 1.14.0
66

7+
# Make Docker builds less verbose
8+
BUILDKIT_PROGRESS: plain
9+
710
# The following images are defined here and their values will be updated by updatecli
811
# Please do not change them manually.
912
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1762801856"
@@ -39,6 +42,26 @@ steps:
3942
machineType: "n2-standard-8"
4043
image: "${IMAGE_UBUNTU_2204_X86_64}"
4144

45+
# Temporary build step to verify building the elastic-agent works.
46+
# This will be removed once OTEL_COMPONENT is removed, because it
47+
# became the default.
48+
- label: ":package: amd64: OTEL_COMPONENT zip,tar.gz,rpm,deb "
49+
key: packaging-amd64-otel-component
50+
env:
51+
PLATFORMS: "windows/amd64,linux/amd64"
52+
PACKAGES: "zip,tar.gz,rpm,deb"
53+
OTEL_COMPONENT: "true"
54+
command: ".buildkite/scripts/steps/integration-package.sh"
55+
artifact_paths:
56+
- build/distributions/**
57+
retry:
58+
automatic:
59+
limit: 1
60+
agents:
61+
provider: "gcp"
62+
machineType: "n2-standard-8"
63+
image: "${IMAGE_UBUNTU_2204_X86_64}"
64+
4265
- label: ":package: amd64: FIPS tar.gz"
4366
key: "packaging-amd64-fips"
4467
env:
@@ -73,6 +96,26 @@ steps:
7396
instanceType: "c6g.2xlarge"
7497
image: "${IMAGE_UBUNTU_2204_ARM_64}"
7598

99+
# Temporary build step to verify building the elastic-agent works.
100+
# This will be removed once OTEL_COMPONENT is removed, because it
101+
# became the default.
102+
- label: ":package: arm64: OTEL_COMPONENT zip,tar.gz"
103+
key: packaging-arm64-otel-component
104+
env:
105+
PLATFORMS: "windows/arm64,linux/arm64"
106+
PACKAGES: "tar.gz,zip"
107+
OTEL_COMPONENT: "true"
108+
command: ".buildkite/scripts/steps/integration-package.sh"
109+
artifact_paths:
110+
- build/distributions/**
111+
retry:
112+
automatic:
113+
limit: 1
114+
agents:
115+
provider: "aws"
116+
instanceType: "c6g.2xlarge"
117+
image: "${IMAGE_UBUNTU_2204_ARM_64}"
118+
76119
- label: ":package: arm64: FIPS tar.gz"
77120
key: "packaging-arm64-fips"
78121
env:
@@ -158,6 +201,40 @@ steps:
158201
diskSizeGb: 200
159202
image: "${IMAGE_UBUNTU_2204_ARM_64}"
160203

204+
- label: ":package: amd64: OTEL_COMPONENT Containers"
205+
key: packaging-containers-amd64-otel-component
206+
env:
207+
PACKAGES: "docker"
208+
PLATFORMS: "linux/amd64"
209+
OTEL_COMPONENT: "true"
210+
command: |
211+
.buildkite/scripts/steps/integration-package.sh
212+
artifact_paths:
213+
- build/distributions/**
214+
agents:
215+
provider: "gcp"
216+
machineType: "n2-standard-8"
217+
diskSizeGb: 200
218+
image: "${IMAGE_UBUNTU_2204_X86_64}"
219+
plugins:
220+
- *vault_docker_login
221+
222+
- label: ":package: arm64: OTEL_COMPONENT Containers"
223+
key: packaging-containers-arm64-otel-component
224+
env:
225+
PACKAGES: "docker"
226+
PLATFORMS: "linux/arm64"
227+
OTEL_COMPONENT: "true"
228+
command: |
229+
.buildkite/scripts/steps/integration-package.sh
230+
artifact_paths:
231+
- build/distributions/**
232+
agents:
233+
provider: "aws"
234+
instanceType: "c6g.2xlarge"
235+
diskSizeGb: 200
236+
image: "${IMAGE_UBUNTU_2204_ARM_64}"
237+
161238
- label: "Triggering Integration tests"
162239
command: "buildkite-agent pipeline upload .buildkite/bk.integration.pipeline.yml"
163240

0 commit comments

Comments
 (0)