Skip to content

Commit 5210899

Browse files
Revert "Temporarily have FIPS integration tests spin up deployments in Produc…" (#10117) (#10867)
This reverts commit c76bfe2. (cherry picked from commit e541096) Co-authored-by: Shaunak Kashyap <[email protected]>
1 parent c13e741 commit 5210899

File tree

1 file changed

+14
-22
lines changed

1 file changed

+14
-22
lines changed

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

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,12 @@ 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-
# 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
15+
- vault_ec_key_staging_frh_gov: &vault_ec_key_staging_frh_gov
2516
elastic/vault-secrets#v0.1.0:
26-
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
17+
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
2718
field: "apiKey"
2819
env_var: "EC_API_KEY"
20+
2921
steps:
3022
- label: Start ESS stack for FIPS integration tests
3123
depends_on:
@@ -34,9 +26,9 @@ steps:
3426
key: integration-fips-ess
3527
env:
3628
FIPS: "true"
37-
# EC_ENDPOINT: "https://api.staging.elastic-gov.com"
38-
# ESS_REGION: "us-gov-east-1"
39-
# TF_VAR_deployment_template_id: "aws-general-purpose"
29+
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
30+
ESS_REGION: "us-gov-east-1"
31+
TF_VAR_deployment_template_id: "aws-general-purpose"
4032
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
4133
TF_VAR_docker_images_name_suffix: "-fips"
4234
command: |
@@ -48,7 +40,7 @@ steps:
4840
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
4941
useCustomGlobalHooks: true
5042
plugins:
51-
- *vault_ec_key_prod
43+
- *vault_ec_key_staging_frh_gov
5244

5345
- group: "fips:Stateful:Ubuntu"
5446
key: integration-tests-ubuntu-fips
@@ -78,7 +70,7 @@ steps:
7870
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
7971
instanceType: "m5.2xlarge"
8072
plugins:
81-
- *vault_ec_key_prod
73+
- *vault_ec_key_staging_frh_gov
8274
matrix:
8375
setup:
8476
sudo:
@@ -110,7 +102,7 @@ steps:
110102
image: "${IMAGE_UBUNTU_ARM64_FIPS}"
111103
instanceType: "m6g.2xlarge"
112104
plugins:
113-
- *vault_ec_key_prod
105+
- *vault_ec_key_staging_frh_gov
114106
matrix:
115107
setup:
116108
sudo:
@@ -139,16 +131,16 @@ steps:
139131
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
140132
instanceType: "m5.2xlarge"
141133
plugins:
142-
- *vault_ec_key_prod
134+
- *vault_ec_key_staging_frh_gov
143135

144136
- label: ESS FIPS stack cleanup
145137
depends_on:
146138
- integration-tests-ubuntu-fips
147139
env:
148140
FIPS: "true"
149-
# EC_ENDPOINT: "https://api.staging.elastic-gov.com"
150-
# ESS_REGION: "us-gov-east-1"
151-
# TF_VAR_deployment_template_id: "aws-general-purpose"
141+
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
142+
ESS_REGION: "us-gov-east-1"
143+
TF_VAR_deployment_template_id: "aws-general-purpose"
152144
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
153145
TF_VAR_docker_images_name_suffix: "-fips"
154146
allow_dependency_failure: true
@@ -160,7 +152,7 @@ steps:
160152
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
161153
useCustomGlobalHooks: true
162154
plugins:
163-
- *vault_ec_key_prod
155+
- *vault_ec_key_staging_frh_gov
164156

165157
- label: Aggregate test reports
166158
depends_on:

0 commit comments

Comments
 (0)