Skip to content

Commit 075605d

Browse files
michalpristasmichalpristas
committed
fixed conflict with otel work
2 parents 85c1a6d + 44548f0 commit 075605d

85 files changed

Lines changed: 2424 additions & 826 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,31 @@ env:
44
ASDF_MAGE_VERSION: 1.14.0
55
MS_GOTOOLCHAIN_TELEMETRY_ENABLED: "0"
66

7-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1760144464"
8-
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1760144464"
9-
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1760144464"
7+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1761958868"
8+
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1761958868"
9+
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1761958868"
1010
ASDF_TERRAFORM_VERSION: 1.9.2
1111

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
23+
depends_on:
24+
- packaging-containers-amd64-fips
25+
- packaging-containers-arm64-fips
3126
key: integration-fips-ess
3227
env:
3328
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"
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"
3732
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
3833
TF_VAR_docker_images_name_suffix: "-fips"
3934
command: |
@@ -45,7 +40,7 @@ steps:
4540
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
4641
useCustomGlobalHooks: true
4742
plugins:
48-
- *vault_ec_key_prod
43+
- *vault_ec_key_staging_frh_gov
4944

5045
- group: "fips:Stateful:Ubuntu"
5146
key: integration-tests-ubuntu-fips
@@ -54,13 +49,15 @@ steps:
5449
steps:
5550
- label: "fips:x86_64:sudo-{{matrix.sudo}}:{{matrix.groups}}"
5651
depends_on:
57-
- packaging-ubuntu-x86-64-fips # Reuse artifacts produced in .buildkite/integration.pipeline.yml
52+
- packaging-amd64-fips # Reuse artifacts produced in .buildkite/integration.pipeline.yml
5853
env:
5954
FIPS: "true"
55+
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
56+
ESS_REGION: "us-gov-east-1"
6057
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
6158
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
6259
command: |
63-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-x86-64-fips'
60+
buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64-fips'
6461
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.groups}} {{matrix.sudo}}
6562
artifact_paths:
6663
- build/**
@@ -73,7 +70,7 @@ steps:
7370
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
7471
instanceType: "m5.2xlarge"
7572
plugins:
76-
- *vault_ec_key_prod
73+
- *vault_ec_key_staging_frh_gov
7774
matrix:
7875
setup:
7976
sudo:
@@ -84,13 +81,15 @@ steps:
8481

8582
- label: "fips:arm64:sudo-{{matrix.sudo}}:{{matrix.groups}}"
8683
depends_on:
87-
- packaging-ubuntu-arm64-fips
84+
- packaging-arm64-fips
8885
env:
8986
FIPS: "true"
87+
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
88+
ESS_REGION: "us-gov-east-1"
9089
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
9190
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
9291
command: |
93-
buildkite-agent artifact download build/distributions/** . --step 'packaging-ubuntu-arm64-fips'
92+
buildkite-agent artifact download build/distributions/** . --step 'packaging-arm64-fips'
9493
.buildkite/scripts/steps/integration_tests_tf.sh {{matrix.groups}} {{matrix.sudo}}
9594
artifact_paths:
9695
- build/**
@@ -103,7 +102,7 @@ steps:
103102
image: "${IMAGE_UBUNTU_ARM64_FIPS}"
104103
instanceType: "m6g.2xlarge"
105104
plugins:
106-
- *vault_ec_key_prod
105+
- *vault_ec_key_staging_frh_gov
107106
matrix:
108107
setup:
109108
sudo:
@@ -116,6 +115,8 @@ steps:
116115
if: build.env("BUILDKITE_PULL_REQUEST") != "false" && build.env("GITHUB_PR_LABELS") =~ /.*(Testing:run:TestUpgradeIntegrationsServer).*/
117116
env:
118117
FIPS: "true"
118+
EC_ENDPOINT: "https://api.staging.elastic-gov.com"
119+
ESS_REGION: "us-gov-east-1"
119120
TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
120121
command: |
121122
.buildkite/scripts/buildkite-integration-tests.sh ech-deployment false
@@ -130,16 +131,16 @@ steps:
130131
image: "${IMAGE_UBUNTU_X86_64_FIPS}"
131132
instanceType: "m5.2xlarge"
132133
plugins:
133-
- *vault_ec_key_prod
134+
- *vault_ec_key_staging_frh_gov
134135

135136
- label: ESS FIPS stack cleanup
136137
depends_on:
137138
- integration-tests-ubuntu-fips
138139
env:
139140
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"
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"
143144
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
144145
TF_VAR_docker_images_name_suffix: "-fips"
145146
allow_dependency_failure: true
@@ -151,7 +152,7 @@ steps:
151152
image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.5"
152153
useCustomGlobalHooks: true
153154
plugins:
154-
- *vault_ec_key_prod
155+
- *vault_ec_key_staging_frh_gov
155156

156157
- label: Aggregate test reports
157158
depends_on:

0 commit comments

Comments
 (0)