Skip to content

Commit 357ccbb

Browse files
ycombinatormergify[bot]
authored andcommitted
Revert "Temporarily have FIPS integration tests spin up deployments in Produc…" (#10117)
This reverts commit c76bfe2. (cherry picked from commit e541096)
1 parent d5d4a46 commit 357ccbb

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,28 +12,20 @@ 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
key: integration-fips-ess
3224
env:
3325
FIPS: "true"
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"
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"
3729
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
3830
TF_VAR_docker_images_name_suffix: "-fips"
3931
command: |
@@ -45,7 +37,7 @@ steps:
4537
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
4638
useCustomGlobalHooks: true
4739
plugins:
48-
- *vault_ec_key_prod
40+
- *vault_ec_key_staging_frh_gov
4941

5042
- group: "fips:Stateful:Ubuntu"
5143
key: integration-tests-ubuntu-fips
@@ -73,7 +65,7 @@ steps:
7365
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
7466
instanceType: "m5.2xlarge"
7567
plugins:
76-
- *vault_ec_key_prod
68+
- *vault_ec_key_staging_frh_gov
7769
matrix:
7870
setup:
7971
sudo:
@@ -103,7 +95,7 @@ steps:
10395
image: "${IMAGE_UBUNTU_ARM64_FIPS}"
10496
instanceType: "m6g.2xlarge"
10597
plugins:
106-
- *vault_ec_key_prod
98+
- *vault_ec_key_staging_frh_gov
10799
matrix:
108100
setup:
109101
sudo:
@@ -130,16 +122,16 @@ steps:
130122
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
131123
instanceType: "m5.2xlarge"
132124
plugins:
133-
- *vault_ec_key_prod
125+
- *vault_ec_key_staging_frh_gov
134126

135127
- label: ESS FIPS stack cleanup
136128
depends_on:
137129
- integration-tests-ubuntu-fips
138130
env:
139131
FIPS: "true"
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"
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"
143135
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
144136
TF_VAR_docker_images_name_suffix: "-fips"
145137
allow_dependency_failure: true
@@ -151,7 +143,7 @@ steps:
151143
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
152144
useCustomGlobalHooks: true
153145
plugins:
154-
- *vault_ec_key_prod
146+
- *vault_ec_key_staging_frh_gov
155147

156148
- label: Aggregate test reports
157149
depends_on:

0 commit comments

Comments
 (0)