Skip to content

Commit 178408d

Browse files
ycombinatormergify[bot]
authored andcommitted
Temporarily have FIPS integration tests spin up deployments in Production CFT environment (#10007)
* Have FIPS integration tests spin up deployments in Production CFT environment * Add explanatory comment * Run extended tests if FIPS integration tests pipeline changes * Revert "Run extended tests if FIPS integration tests pipeline changes" This reverts commit ae0e89d. (cherry picked from commit c76bfe2)
1 parent 0bd9796 commit 178408d

File tree

1 file changed

+22
-14
lines changed

1 file changed

+22
-14
lines changed

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

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,28 @@ env:
1212
# This section is used to define the plugins that will be used in the pipeline.
1313
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
1414
common:
15-
- vault_ec_key_staging_frh_gov: &vault_ec_key_staging_frh_gov
15+
# We are temporarily using the Production CFT environment API key instead of the
16+
# Staging GovCloud one. This is being done until issues with creating deployments in
17+
# Staging GovCloud are fixed. Once those are fixed, uncomment the `vault_ec_key_staging_frh_gov`
18+
# section and delete the `vault_ec_key_prod` section below.
19+
# - vault_ec_key_staging_frh_gov: &vault_ec_key_staging_frh_gov
20+
# elastic/vault-secrets#v0.1.0:
21+
# path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
22+
# field: "apiKey"
23+
# env_var: "EC_API_KEY"
24+
- vault_ec_key_prod: &vault_ec_key_prod
1625
elastic/vault-secrets#v0.1.0:
17-
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
26+
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
1827
field: "apiKey"
1928
env_var: "EC_API_KEY"
20-
2129
steps:
2230
- label: Start ESS stack for FIPS integration tests
2331
key: integration-fips-ess
2432
env:
2533
FIPS: "true"
26-
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
27-
ESS_REGION: "us-gov-east-1"
28-
TF_VAR_deployment_template_id: "aws-general-purpose"
34+
# EC_ENDPOINT: "https://api.staging.elastic-gov.com"
35+
# ESS_REGION: "us-gov-east-1"
36+
# TF_VAR_deployment_template_id: "aws-general-purpose"
2937
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
3038
TF_VAR_docker_images_name_suffix: "-fips"
3139
command: |
@@ -37,7 +45,7 @@ steps:
3745
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
3846
useCustomGlobalHooks: true
3947
plugins:
40-
- *vault_ec_key_staging_frh_gov
48+
- *vault_ec_key_prod
4149

4250
- group: "fips:Stateful:Ubuntu"
4351
key: integration-tests-ubuntu-fips
@@ -65,7 +73,7 @@ steps:
6573
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
6674
instanceType: "m5.2xlarge"
6775
plugins:
68-
- *vault_ec_key_staging_frh_gov
76+
- *vault_ec_key_prod
6977
matrix:
7078
setup:
7179
sudo:
@@ -95,7 +103,7 @@ steps:
95103
image: "${IMAGE_UBUNTU_ARM64_FIPS}"
96104
instanceType: "m6g.2xlarge"
97105
plugins:
98-
- *vault_ec_key_staging_frh_gov
106+
- *vault_ec_key_prod
99107
matrix:
100108
setup:
101109
sudo:
@@ -122,16 +130,16 @@ steps:
122130
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
123131
instanceType: "m5.2xlarge"
124132
plugins:
125-
- *vault_ec_key_staging_frh_gov
133+
- *vault_ec_key_prod
126134

127135
- label: ESS FIPS stack cleanup
128136
depends_on:
129137
- integration-tests-ubuntu-fips
130138
env:
131139
FIPS: "true"
132-
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
133-
ESS_REGION: "us-gov-east-1"
134-
TF_VAR_deployment_template_id: "aws-general-purpose"
140+
# EC_ENDPOINT: "https://api.staging.elastic-gov.com"
141+
# ESS_REGION: "us-gov-east-1"
142+
# TF_VAR_deployment_template_id: "aws-general-purpose"
135143
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
136144
TF_VAR_docker_images_name_suffix: "-fips"
137145
allow_dependency_failure: true
@@ -143,7 +151,7 @@ steps:
143151
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
144152
useCustomGlobalHooks: true
145153
plugins:
146-
- *vault_ec_key_staging_frh_gov
154+
- *vault_ec_key_prod
147155

148156
- label: Aggregate test reports
149157
depends_on:

0 commit comments

Comments
 (0)