Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 0 additions & 23 deletions .buildkite/bk.integration-fips.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,8 @@ common:
env_var: "EC_API_KEY"

steps:
- label: Build and push custom elastic-agent image
depends_on:
- 'packaging-containers-x86-64-fips' # Reuse artifacts produced in .buildkite/integration.pipeline.yml
key: integration-fips-cloud-image
env:
FIPS: "true"
CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
command: |
buildkite-agent artifact download build/distributions/elastic-agent-cloud-fips-*-linux-amd64.docker.tar.gz . --step 'packaging-containers-x86-64-fips'
mage cloud:load
mage cloud:push
agents:
provider: "gcp"
machineType: "n1-standard-8"
image: "${IMAGE_UBUNTU_2404_X86_64}"
plugins:
- elastic/vault-docker-login#v0.5.2:
secret_path: 'kv/ci-shared/platform-ingest/elastic_docker_registry'

- label: Start ESS stack for FIPS integration tests
key: integration-fips-ess
depends_on:
- integration-fips-cloud-image
env:
ASDF_TERRAFORM_VERSION: 1.9.2
FIPS: "true"
Expand Down
11 changes: 11 additions & 0 deletions .buildkite/integration.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ env:
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1753491662"
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1753491662"

common:
- vault_docker_login: &vault_docker_login
elastic/vault-docker-login#v0.5.2:
secret_path: 'kv/ci-shared/platform-ingest/elastic_docker_registry'

steps:
- group: "Integration tests: packaging"
key: "int-packaging"
Expand Down Expand Up @@ -108,13 +113,16 @@ steps:
PLATFORMS: "linux/amd64"
command: |
.buildkite/scripts/steps/integration-package.sh
.buildkite/scripts/steps/integration-cloud-image-push.sh
artifact_paths:
- build/distributions/**
agents:
provider: "gcp"
machineType: "n2-standard-8"
diskSizeGb: 200
image: "${IMAGE_UBUNTU_2204_X86_64}"
plugins:
- *vault_docker_login

- label: "Packaging: Containers linux/arm64"
key: packaging-containers-arm64
Expand All @@ -139,13 +147,16 @@ steps:
FIPS: "true"
command: |
.buildkite/scripts/steps/integration-package.sh
.buildkite/scripts/steps/integration-cloud-image-push.sh
artifact_paths:
- build/distributions/**
agents:
provider: "gcp"
machineType: "n2-standard-8"
diskSizeGb: 200
image: "${IMAGE_UBUNTU_2204_X86_64}"
plugins:
- *vault_docker_login

- label: "Packaging: Containers linux/arm64 FIPS"
key: packaging-containers-arm64-fips
Expand Down
Loading