Skip to content

[8.18] (backport #7958) Pin VM version for check-ci #7966

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

Merged
oakrizan merged 2 commits into from
Apr 24, 2025
Merged

[8.18] (backport #7958) Pin VM version for check-ci #7966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98990fc
pinned version (#7958)
oakrizan Apr 24, 2025
0de8a00
resolved conflicts
oakrizan Apr 24, 2025
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
31 changes: 19 additions & 12 deletions .buildkite/bk.integration.pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ env:
VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
ASDF_MAGE_VERSION: 1.14.0

IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1744855248"
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1744855248"
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1744855248"
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1744855248"
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1744855248"
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1744855248"

steps:
- label: Start ESS stack for integration tests
key: integration-ess
Expand Down Expand Up @@ -38,7 +45,7 @@ steps:
agents:
provider: "gcp"
machineType: "n1-standard-8"
image: "family/platform-ingest-elastic-agent-windows-2022"
image: "${IMAGE_WIN_2022}"
retry:
automatic:
limit: 1
Expand All @@ -63,7 +70,7 @@ steps:
agents:
provider: "gcp"
machineType: "n1-standard-8"
image: "family/platform-ingest-elastic-agent-windows-2022"
image: "${IMAGE_WIN_2022}"
retry:
automatic:
limit: 1
Expand All @@ -82,7 +89,7 @@ steps:
agents:
provider: "gcp"
machineType: "n1-standard-8"
image: "family/platform-ingest-elastic-agent-windows-2025"
image: "${IMAGE_WIN_2025}"
retry:
automatic:
limit: 1
Expand Down Expand Up @@ -111,7 +118,7 @@ steps:
agents:
provider: "gcp"
machineType: "n1-standard-8"
image: "family/platform-ingest-elastic-agent-windows-2025"
image: "${IMAGE_WIN_2025}"
matrix:
- default

Expand All @@ -134,7 +141,7 @@ steps:
agents:
provider: "gcp"
machineType: "n1-standard-8"
image: "family/platform-ingest-elastic-agent-ubuntu-2404"
image: "${IMAGE_UBUNTU_2404_X86_64}"
matrix:
- default

Expand All @@ -154,7 +161,7 @@ steps:
agents:
provider: "gcp"
machineType: "n1-standard-8"
image: "family/platform-ingest-elastic-agent-ubuntu-2404"
image: "${IMAGE_UBUNTU_2404_X86_64}"
matrix:
- default
- upgrade
Expand All @@ -181,7 +188,7 @@ steps:
- build/diagnostics/**
agents:
provider: "aws"
imagePrefix: "platform-ingest-elastic-agent-ubuntu-2404-aarch64"
image: "${IMAGE_UBUNTU_2404_ARM_64}"
instanceType: "m6g.2xlarge"
retry:
automatic:
Expand Down Expand Up @@ -217,7 +224,7 @@ steps:
limit: 1
agents:
provider: "aws"
imagePrefix: "platform-ingest-elastic-agent-ubuntu-2404-aarch64"
image: "${IMAGE_UBUNTU_2404_ARM_64}"
instanceType: "m6g.xlarge"
matrix:
- default
Expand All @@ -241,7 +248,7 @@ steps:
agents:
provider: "gcp"
machineType: "n1-standard-8"
image: "family/platform-ingest-elastic-agent-debian-12"
image: "${IMAGE_DEBIAN_12}"
matrix:
- default

Expand All @@ -261,7 +268,7 @@ steps:
agents:
provider: "gcp"
machineType: "n1-standard-8"
image: "family/platform-ingest-elastic-agent-debian-12"
image: "${IMAGE_DEBIAN_12}"
matrix:
- default
- upgrade
Expand Down Expand Up @@ -299,7 +306,7 @@ steps:
agents:
provider: "gcp"
machineType: "n1-standard-8"
image: "family/platform-ingest-elastic-agent-rhel-8"
image: "${IMAGE_RHEL_8}"

- group: "Kubernetes"
key: integration-tests-kubernetes
Expand All @@ -326,7 +333,7 @@ steps:
agents:
provider: "gcp"
machineType: "n1-standard-4"
image: "family/platform-ingest-elastic-agent-ubuntu-2404"
image: "${IMAGE_UBUNTU_2404_X86_64}"
diskSizeGb: 80
matrix:
setup:
Expand Down
27 changes: 18 additions & 9 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,21 @@
env:
VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
DOCKER_REGISTRY: "docker.elastic.co"

IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1744855248"
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1744855248"
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1744855248"
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1744855248"
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1744855248"
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1744855248"

steps:
- label: "check-ci"
key: "check-ci"
command: ".buildkite/scripts/steps/check-ci.sh"
agents:
provider: "gcp"
image: "family/platform-ingest-elastic-agent-ubuntu-2204"
image: "${IMAGE_UBUNTU_2204_X86_64}"
retry:
manual:
allowed: true
Expand All @@ -27,7 +35,7 @@ steps:
- "coverage-*.out"
agents:
provider: "gcp"
image: "family/platform-ingest-elastic-agent-ubuntu-2204"
image: "${IMAGE_UBUNTU_2204_X86_64}"
retry:
automatic:
limit: 1
Expand All @@ -44,7 +52,7 @@ steps:
- "coverage-*.out"
agents:
provider: "aws"
imagePrefix: "platform-ingest-elastic-agent-ubuntu-2404-aarch64"
image: "${IMAGE_UBUNTU_2204_ARM_64}"
diskSizeGb: 200
instanceType: "m6g.xlarge"
retry:
Expand All @@ -63,7 +71,7 @@ steps:
- "coverage-*.out"
agents:
provider: "gcp"
image: "family/platform-ingest-elastic-agent-windows-2022"
image: "${IMAGE_WIN_2022}"
machine_type: "n2-standard-8"
disk_size: 200
disk_type: "pd-ssd"
Expand All @@ -83,7 +91,7 @@ steps:
- "coverage-*.out"
agents:
provider: "gcp"
image: "family/platform-ingest-elastic-agent-windows-2016"
image: "${IMAGE_WIN_2016}"
machine_type: "n2-standard-8"
disk_size: 200
disk_type: "pd-ssd"
Expand Down Expand Up @@ -143,14 +151,15 @@ steps:
- "coverage-*.out"
agents:
provider: "gcp"
image: "family/platform-ingest-elastic-agent-windows-10"
image: "${IMAGE_WIN_10}"
machine_type: "n2-standard-8"
disk_type: "pd-ssd"
retry:
automatic:
limit: 1
manual:
allowed: true

- label: "Unit tests - Windows 11"
key: "unit-tests-win11"
command: .buildkite/scripts/steps/unit-tests.ps1
Expand All @@ -161,7 +170,7 @@ steps:
- "coverage-*.out"
agents:
provider: "gcp"
image: "family/platform-ingest-elastic-agent-windows-11"
image: "${IMAGE_WIN_11}"
machine_type: "n2-standard-8"
disk_type: "pd-ssd"
retry:
Expand Down Expand Up @@ -219,7 +228,7 @@ steps:
command: ".buildkite/scripts/steps/k8s-tests.sh"
agents:
provider: "gcp"
image: "family/platform-ingest-elastic-agent-ubuntu-2204"
image: "${IMAGE_UBUNTU_2204_X86_64}"
matrix:
setup:
k8s_version:
Expand Down Expand Up @@ -263,7 +272,7 @@ steps:
command: ".buildkite/scripts/steps/sync-k8s.sh"
agents:
provider: "gcp"
image: "family/platform-ingest-elastic-agent-ubuntu-2204"
image: "${IMAGE_UBUNTU_2204_X86_64}"
env:
- GH_VERSION=2.4.0

Expand Down