Skip to content

Commit e94a92d

Browse files
committed
Updated FIPS pipeline
1 parent c874de2 commit e94a92d

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ env:
77
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1749862860"
88
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1749862860"
99

10+
# This section is used to define the plugins that will be used in the pipeline.
11+
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
12+
common:
13+
- vault_ec_key_prod: &vault_ec_key_prod
14+
elastic/vault-secrets#v0.1.0:
15+
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
16+
field: "apiKey"
17+
env_var: "EC_API_KEY"
18+
1019
steps:
1120
- label: Build and push custom elastic-agent image
1221
depends_on:
@@ -46,6 +55,8 @@ steps:
4655
agents:
4756
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
4857
useCustomGlobalHooks: true
58+
plugins:
59+
- *vault_ec_key_prod
4960

5061
- group: "fips:Stateful:Ubuntu"
5162
key: integration-tests-ubuntu-fips
@@ -73,6 +84,8 @@ steps:
7384
provider: "aws"
7485
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
7586
instanceType: "m5.2xlarge"
87+
plugins:
88+
- *vault_ec_key_prod
7689
matrix:
7790
setup:
7891
sudo:
@@ -102,6 +115,8 @@ steps:
102115
provider: "aws"
103116
image: "${IMAGE_UBUNTU_ARM64_FIPS}"
104117
instanceType: "m6g.2xlarge"
118+
plugins:
119+
- *vault_ec_key_prod
105120
matrix:
106121
setup:
107122
sudo:
@@ -121,6 +136,8 @@ steps:
121136
agents:
122137
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
123138
useCustomGlobalHooks: true
139+
plugins:
140+
- *vault_ec_key_prod
124141

125142
- label: Aggregate test reports
126143
depends_on:

.buildkite/bk.integration.pipeline.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@ common:
3737
KIBANA_HOST: ea-serverless-it-kibana-hostname
3838
KIBANA_USERNAME: ea-serverless-it-kibana-username
3939
KIBANA_PASSWORD: ea-serverless-it-kibana-password
40-
41-
# Anchors with repeatedly used plugin configurations
42-
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
43-
common:
4440
- vault_ec_key_prod: &vault_ec_key_prod
4541
elastic/vault-secrets#v0.1.0:
4642
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
4743
field: "apiKey"
48-
env_var: "EC_API_KEY"
44+
env_var: "EC_API_KEY"
4945

5046
steps:
5147
- label: Start ESS stack for integration tests

0 commit comments

Comments
 (0)