Skip to content

Commit 84140f0

Browse files
Temporarily redirect FIPS ECH tests to Production CFT (#50005) (#50012)
FRH Staging is currently unable to provision deployments, causing the x-pack/{filebeat,metricbeat} FIPS ECH integration tests to fail. This temporarily points those pipelines at the Production CFT environment until the incident is resolved. Revert once FRH Staging is healthy. (cherry picked from commit 08e091f) Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com>
1 parent 5e62fa2 commit 84140f0

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

.buildkite/x-pack/pipeline.xpack.filebeat.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,13 @@ steps:
220220
env:
221221
ASDF_TERRAFORM_VERSION: "1.9.3"
222222
ASDF_PYTHON_VERSION: "3.9.13" # Not needed by ECH tests, but needed by VM
223-
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
224-
TF_VAR_ech_region: "us-gov-east-1"
225-
TF_VAR_deployment_template_id: "aws-general-purpose"
223+
# We are temporarily using the Production CFT environment instead of the Staging GovCloud
224+
# one. This is being done until issues with creating deployments in Staging GovCloud are
225+
# fixed. Once this happens, uncomment the lines below and delete the gcp-us-west2 line.
226+
# EC_ENDPOINT: "https://api.staging.elastic-gov.com"
227+
# TF_VAR_ech_region: "us-gov-east-1"
228+
# TF_VAR_deployment_template_id: "aws-general-purpose"
229+
TF_VAR_ech_region: "gcp-us-west2"
226230
command: |
227231
.buildkite/scripts/custom_fips_ech_test.sh x-pack/filebeat
228232
retry:
@@ -244,7 +248,12 @@ steps:
244248
branches: "main"
245249
debug: true
246250
- elastic/vault-secrets#v0.1.0:
247-
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
251+
# We are temporarily using the Production CFT environment API key instead of the
252+
# Staging GovCloud one. This is being done until issues with creating deployments in
253+
# Staging GovCloud are fixed. Once this happens, uncomment the line below and delete
254+
# the vault_ec_key_prod line.
255+
# path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
256+
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
248257
field: "apiKey"
249258
env_var: "EC_API_KEY"
250259
notify:

.buildkite/x-pack/pipeline.xpack.metricbeat.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,13 @@ steps:
259259
env:
260260
ASDF_TERRAFORM_VERSION: "1.9.3"
261261
ASDF_PYTHON_VERSION: "3.9.13" # Not needed by ECH tests, but needed by VM
262-
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
263-
TF_VAR_ech_region: "us-gov-east-1"
264-
TF_VAR_deployment_template_id: "aws-general-purpose"
262+
# We are temporarily using the Production CFT environment instead of the Staging GovCloud
263+
# one. This is being done until issues with creating deployments in Staging GovCloud are
264+
# fixed. Once this happens, uncomment the lines below and delete the gcp-us-west2 line.
265+
# EC_ENDPOINT: "https://api.staging.elastic-gov.com"
266+
# TF_VAR_ech_region: "us-gov-east-1"
267+
# TF_VAR_deployment_template_id: "aws-general-purpose"
268+
TF_VAR_ech_region: "gcp-us-west2"
265269
command: |
266270
.buildkite/scripts/custom_fips_ech_test.sh x-pack/metricbeat
267271
retry:
@@ -284,7 +288,12 @@ steps:
284288
branches: "main"
285289
debug: true
286290
- elastic/vault-secrets#v0.1.0:
287-
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
291+
# We are temporarily using the Production CFT environment API key instead of the
292+
# Staging GovCloud one. This is being done until issues with creating deployments in
293+
# Staging GovCloud are fixed. Once this happens, uncomment the line below and delete
294+
# the vault_ec_key_prod line.
295+
# path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
296+
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
288297
field: "apiKey"
289298
env_var: "EC_API_KEY"
290299
notify:

0 commit comments

Comments
 (0)