Skip to content

[8.19](backport #46744) Revert "Temporarily have FIPS integration tests spin up deployments in Production CFT environment" #47362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 8.19
Choose a base branch
from
+9 −27
Open

[8.19](backport #46744) Revert "Temporarily have FIPS integration tests spin up deployments in Production CFT environment" #47362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions .buildkite/x-pack/pipeline.xpack.filebeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,9 @@ steps:
env:
ASDF_TERRAFORM_VERSION: "1.9.3"
ASDF_PYTHON_VERSION: "3.9.13" # Not needed by ECH tests, but needed by VM
# We are temporarily using the Production CFT environment instead of the Staging GovCloud
# one. This is being done until issues with creating deployments in Staging GovCloud are
# fixed. Once this happens, uncomment the lines below and delete the gcp-us-west2 line.
# EC_ENDPOINT: "https://api.staging.elastic-gov.com"
# TF_VAR_ech_region: "us-gov-east-1"
# TF_VAR_deployment_template_id: "aws-general-purpose"
TF_VAR_ech_region: "gcp-us-west2"
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
TF_VAR_ech_region: "us-gov-east-1"
TF_VAR_deployment_template_id: "aws-general-purpose"
command: |
.buildkite/scripts/custom_fips_ech_test.sh x-pack/filebeat
retry:
Expand All @@ -226,12 +222,7 @@ steps:
branches: "main"
debug: true
- elastic/vault-secrets#v0.1.0:
# We are temporarily using the Production CFT environment API key instead of the
# Staging GovCloud one. This is being done until issues with creating deployments in
# Staging GovCloud are fixed. Once this happens, uncomment the line below and delete
# the vault_ec_key_prod line.
# path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
field: "apiKey"
env_var: "EC_API_KEY"
notify:
Expand Down Expand Up @@ -538,4 +529,4 @@ steps:
instanceType: "${AWS_ARM_INSTANCE_TYPE}"
notify:
- github_commit_status:
context: "x-pack/filebeat: Packaging Linux arm64 FIPS"
context: "x-pack/filebeat: Packaging Linux arm64 FIPS"
17 changes: 4 additions & 13 deletions .buildkite/x-pack/pipeline.xpack.metricbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,9 @@ steps:
env:
ASDF_TERRAFORM_VERSION: "1.9.3"
ASDF_PYTHON_VERSION: "3.9.13" # Not needed by ECH tests, but needed by VM
# We are temporarily using the Production CFT environment instead of the Staging GovCloud
# one. This is being done until issues with creating deployments in Staging GovCloud are
# fixed. Once this happens, uncomment the lines below and delete the gcp-us-west2 line.
# EC_ENDPOINT: "https://api.staging.elastic-gov.com"
# TF_VAR_ech_region: "us-gov-east-1"
# TF_VAR_deployment_template_id: "aws-general-purpose"
TF_VAR_ech_region: "gcp-us-west2"
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
TF_VAR_ech_region: "us-gov-east-1"
TF_VAR_deployment_template_id: "aws-general-purpose"
command: |
.buildkite/scripts/custom_fips_ech_test.sh x-pack/metricbeat
retry:
Expand All @@ -263,12 +259,7 @@ steps:
branches: "main"
debug: true
- elastic/vault-secrets#v0.1.0:
# We are temporarily using the Production CFT environment API key instead of the
# Staging GovCloud one. This is being done until issues with creating deployments in
# Staging GovCloud are fixed. Once this happens, uncomment the line below and delete
# the vault_ec_key_prod line.
# path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
field: "apiKey"
env_var: "EC_API_KEY"
notify:
Expand Down