Skip to content

Commit c874de2

Browse files
committed
Merge branch 'main' of github.com:elastic/elastic-agent into ci_use_vault_plugin
2 parents 924f741 + d3bc5d9 commit c874de2

File tree

118 files changed

+10663
-6170
lines changed

Some content is hidden

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

118 files changed

+10663
-6170
lines changed
Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
3+
env:
4+
ASDF_MAGE_VERSION: 1.14.0
5+
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"
9+
10+
steps:
11+
- label: Build and push custom elastic-agent image
12+
depends_on:
13+
- 'packaging-containers-x86-64-fips' # Reuse artifacts produced in .buildkite/integration.pipeline.yml
14+
key: integration-fips-cloud-image
15+
env:
16+
FIPS: "true"
17+
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
18+
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-fips-cloud"
19+
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-fips-cloud:git-${BUILDKITE_COMMIT:0:12}"
20+
command: |
21+
buildkite-agent artifact download build/distributions/elastic-agent-fips-cloud-*-linux-amd64.docker.tar.gz . --step 'packaging-containers-x86-64-fips'
22+
mage cloud:load
23+
mage cloud:push
24+
agents:
25+
provider: "gcp"
26+
machineType: "n1-standard-8"
27+
image: "${IMAGE_UBUNTU_2404_X86_64}"
28+
plugins:
29+
- elastic/vault-docker-login#v0.5.2:
30+
secret_path: 'kv/ci-shared/platform-ingest/elastic_docker_registry'
31+
32+
- label: Start ESS stack for FIPS integration tests
33+
key: integration-fips-ess
34+
depends_on:
35+
- integration-fips-cloud-image
36+
env:
37+
ASDF_TERRAFORM_VERSION: 1.9.2
38+
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
39+
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-fips-cloud"
40+
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-fips-cloud:git-${BUILDKITE_COMMIT:0:12}"
41+
command: |
42+
source .buildkite/scripts/steps/ess_start.sh
43+
artifact_paths:
44+
- test_infra/ess/*.tfstate
45+
- test_infra/ess/*.lock.hcl
46+
agents:
47+
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
48+
useCustomGlobalHooks: true
49+
50+
- group: "fips:Stateful:Ubuntu"
51+
key: integration-tests-ubuntu-fips
52+
depends_on:
53+
- integration-fips-ess
54+
steps:
55+
- label: "fips:x86_64:sudo-{{matrix.sudo}}:{{matrix.groups}}"
56+
depends_on:
57+
- packaging-ubuntu-x86-64-fips # Reuse artifacts produced in .buildkite/integration.pipeline.yml
58+
env:
59+
FIPS: "true"
60+
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
61+
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-fips-cloud"
62+
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-fips-cloud:git-${BUILDKITE_COMMIT:0:12}"
63+
command: |
64+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64-fips'
65+
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.groups}} {{matrix.sudo}}
66+
artifact_paths:
67+
- build/**
68+
- build/diagnostics/**
69+
retry:
70+
automatic:
71+
limit: 1
72+
agents:
73+
provider: "aws"
74+
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
75+
instanceType: "m5.2xlarge"
76+
matrix:
77+
setup:
78+
sudo:
79+
- "false"
80+
- "true"
81+
groups:
82+
- fleet # currently there is only a single test in the fleet group, add more tests once they have been defined
83+
84+
- label: "fips:arm64:sudo-{{matrix.sudo}}:{{matrix.groups}}"
85+
depends_on:
86+
- packaging-ubuntu-arm64-fips
87+
env:
88+
FIPS: "true"
89+
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
90+
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-fips-cloud"
91+
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-fips-cloud:git-${BUILDKITE_COMMIT:0:12}"
92+
command: |
93+
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64-fips'
94+
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.groups}} {{matrix.sudo}}
95+
artifact_paths:
96+
- build/**
97+
- build/diagnostics/**
98+
retry:
99+
automatic:
100+
limit: 1
101+
agents:
102+
provider: "aws"
103+
image: "${IMAGE_UBUNTU_ARM64_FIPS}"
104+
instanceType: "m6g.2xlarge"
105+
matrix:
106+
setup:
107+
sudo:
108+
- "false"
109+
- "true"
110+
groups:
111+
- fleet
112+
113+
- label: ESS FIPS stack cleanup
114+
depends_on:
115+
- integration-tests-ubuntu-fips
116+
allow_dependency_failure: true
117+
command: |
118+
buildkite-agent artifact download "test_infra/ess/**" . --step "integration-fips-ess"
119+
ls -lah test_infra/ess
120+
.buildkite/scripts/steps/ess_down.sh
121+
agents:
122+
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
123+
useCustomGlobalHooks: true
124+
125+
- label: Aggregate test reports
126+
depends_on:
127+
- integration-tests-ubuntu-fips
128+
allow_dependency_failure: true
129+
command: |
130+
buildkite-agent artifact download "build/*.xml" .
131+
agents:
132+
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
133+
useCustomGlobalHooks: true
134+
soft_fail:
135+
- exit_status: "*"
136+
plugins:
137+
- elastic/vault-secrets#v0.1.0:
138+
path: "kv/ci-shared/platform-ingest/buildkite_analytics_token"
139+
field: "token"
140+
env_var: "BUILDKITE_ANALYTICS_TOKEN"
141+
- test-collector#v1.11.0:
142+
files: "build/*.xml"
143+
format: "junit"
144+
branches: "main"
145+
debug: true

0 commit comments

Comments
 (0)