Skip to content

Commit cf4a023

Browse files
michel-latermanmichel-laterman
committed
Merge branch 'main' into integration-fips-status-es
2 parents d82e39b + 73737c9 commit cf4a023

File tree

331 files changed

+65335
-1634
lines changed

Some content is hidden

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

331 files changed

+65335
-1634
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
env:
44
ASDF_MAGE_VERSION: 1.14.0
5+
MS_GOTOOLCHAIN_TELEMETRY_ENABLED: "0"
56

6-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1749862860"
7-
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1749862860"
8-
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1749862860"
7+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1750467641"
8+
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1750467641"
9+
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1750467641"
910

1011
steps:
1112
- label: Build and push custom elastic-agent image
@@ -60,6 +61,7 @@ steps:
6061
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
6162
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
6263
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
64+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
6365
command: |
6466
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64-fips'
6567
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.groups}} {{matrix.sudo}}
@@ -89,6 +91,7 @@ steps:
8991
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
9092
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
9193
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
94+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
9295
command: |
9396
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64-fips'
9497
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.groups}} {{matrix.sudo}}

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

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ env:
66

77
# The following images are defined here and their values will be updated by updatecli
88
# Please do not change them manually.
9-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1749862860"
10-
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1749862860"
11-
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1749862860"
12-
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1749862860"
13-
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1749862860"
14-
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1749862860"
9+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1750467641"
10+
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1750467641"
11+
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1750467641"
12+
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1750467641"
13+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1750467641"
14+
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1750467641"
1515

1616
# This section is used to define the plugins that will be used in the pipeline.
1717
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -130,6 +130,8 @@ steps:
130130
- label: "Win2022:sudo:{{matrix}}"
131131
depends_on:
132132
- packaging-windows
133+
env:
134+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
133135
command: |
134136
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
135137
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
@@ -156,6 +158,8 @@ steps:
156158
- label: "Win2022:non-sudo:{{matrix}}"
157159
depends_on:
158160
- packaging-windows
161+
env:
162+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
159163
command: |
160164
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
161165
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
@@ -175,6 +179,8 @@ steps:
175179
- label: "Win2025:sudo:{{matrix}}"
176180
depends_on:
177181
- packaging-windows
182+
env:
183+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
178184
command: |
179185
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
180186
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} true
@@ -201,6 +207,8 @@ steps:
201207
- label: "Win2025:non-sudo:{{matrix}}"
202208
depends_on:
203209
- packaging-windows
210+
env:
211+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
204212
command: |
205213
buildkite-agent artifact download build/distributions/** . --step 'packaging-windows'
206214
.buildkite/scripts/steps/integration_tests_tf.ps1 {{matrix}} false
@@ -227,6 +235,8 @@ steps:
227235
steps:
228236
- label: "x86_64:non-sudo: {{matrix}}"
229237
depends_on: packaging-ubuntu-x86-64
238+
env:
239+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
230240
command: |
231241
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
232242
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
@@ -247,6 +257,8 @@ steps:
247257
depends_on:
248258
- packaging-ubuntu-x86-64
249259
# due to deb group present in matrix tar.gz and deb packages artifacts are required
260+
env:
261+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
250262
command: |
251263
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
252264
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
@@ -279,6 +291,8 @@ steps:
279291
- label: "arm:sudo: {{matrix}}"
280292
depends_on:
281293
- packaging-ubuntu-arm64
294+
env:
295+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
282296
command: |
283297
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64'
284298
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
@@ -313,6 +327,8 @@ steps:
313327
skip: true
314328
depends_on:
315329
- packaging-ubuntu-arm64
330+
env:
331+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
316332
command: |
317333
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64'
318334
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
@@ -339,6 +355,8 @@ steps:
339355
steps:
340356
- label: "x86_64:non-sudo: {{matrix}}"
341357
depends_on: packaging-ubuntu-x86-64
358+
env:
359+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
342360
command: |
343361
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64'
344362
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
@@ -359,6 +377,8 @@ steps:
359377
depends_on:
360378
- packaging-ubuntu-x86-64
361379
# due to deb group present in matrix tar.gz and deb packages artifacts are required
380+
env:
381+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
362382
command: |
363383
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
364384
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} true
@@ -400,6 +420,8 @@ steps:
400420
- label: "x86_64:sudo:rpm"
401421
depends_on:
402422
- packaging-ubuntu-x86-64
423+
env:
424+
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
403425
command: |
404426
buildkite-agent artifact download build/distributions/** . --step packaging-ubuntu-x86-64
405427
.buildkite/scripts/steps/integration_tests_tf.sh rpm true

‎.buildkite/pipeline.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ env:
55

66
# The following images are defined here and their values will be updated by updatecli
77
# Please do not change them manually.
8-
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1749862860"
9-
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1749862860"
10-
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1749862860"
11-
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1749862860"
12-
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1749862860"
13-
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1749862860"
8+
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1750467641"
9+
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1750467641"
10+
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1750467641"
11+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1750467641"
12+
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1750467641"
13+
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1750467641"
1414

1515
steps:
1616
- label: "check-ci"

‎.buildkite/scripts/steps/integration_tests_tf.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ if [[ "${BUILDKITE_RETRY_COUNT}" -gt 0 ]]; then
3636
echo "~~~ The steps is retried, starting the ESS stack again"
3737
trap 'ess_down' EXIT
3838
ess_up $OVERRIDE_STACK_VERSION || (echo -e "^^^ +++\nFailed to start ESS stack")
39-
preinstall_fleet_packages
4039
else
4140
# For the first run, we start the stack in the start_ess.sh step and it sets the meta-data
4241
echo "~~~ Receiving ESS stack metadata"

‎.ci/updatecli/updatecli-bump-vm-images.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ actions:
2626
labels:
2727
- dependencies
2828
- backport-skip
29+
- skip-changelog
2930
title: '[{{ requiredEnv "BRANCH_NAME" }}][Automation] Bump VM Image version to {{ source "latestVersion" }}'
3031

3132
sources:

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ check-ci:
4141
@mage -v helm:lint
4242
@mage -v helm:updateAgentVersion
4343
@mage -v helm:renderExamples
44+
@mage -v integration:buildKubernetesTestData
4445
@$(MAKE) check-no-changes
4546

4647
## check: run all the checks including linting using golangci-lint.

0 commit comments

Comments
 (0)