From 98990fc6d48384cfd69533d85e306d92d506654d Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Thu, 24 Apr 2025 16:26:18 +0300 Subject: [PATCH 1/2] pinned version (#7958) (cherry picked from commit 1f770331230fe0477e6fc13753a1e99dce475e1a) # Conflicts: # .buildkite/pipeline.yml --- .buildkite/bk.integration.pipeline.yml | 31 +++++++----- .buildkite/pipeline.yml | 69 ++++++++++++++++++++++---- 2 files changed, 79 insertions(+), 21 deletions(-) diff --git a/.buildkite/bk.integration.pipeline.yml b/.buildkite/bk.integration.pipeline.yml index 8a63416331a..b786db98b68 100644 --- a/.buildkite/bk.integration.pipeline.yml +++ b/.buildkite/bk.integration.pipeline.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 4a0d2e5f400..6730cc4dba3 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -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 @@ -27,13 +35,55 @@ steps: - "coverage-*.out" agents: provider: "gcp" - image: "family/platform-ingest-elastic-agent-ubuntu-2204" + image: "${IMAGE_UBUNTU_2204_X86_64}" + retry: + automatic: + limit: 1 + manual: + allowed: true + +<<<<<<< HEAD +======= + - label: "Unit tests - Ubuntu 22.04 with requirefips build tag" + key: "unit-tests-2204-fips-tag" + command: ".buildkite/scripts/steps/unit-tests.sh" + env: + FIPS: "true" + artifact_paths: + - "build/TEST-*.html" + - "build/TEST-*.xml" + - "build/diagnostics/*" + - "coverage-*.out" + agents: + provider: "gcp" + image: "${IMAGE_UBUNTU_2204_X86_64}" retry: automatic: limit: 1 manual: allowed: true + - label: "Unit tests - fips140=only Ubuntu 22.04" + key: "unit-tests-2204-fips140-only" + command: ".buildkite/scripts/steps/unit-tests.sh" + env: + FIPS: "true" + GODEBUG: "fips140=only" + artifact_paths: + - "build/TEST-*.html" + - "build/TEST-*.xml" + - "build/diagnostics/*" + - "coverage-*.out" + agents: + provider: "gcp" + image: "${IMAGE_UBUNTU_2204_X86_64}" + retry: + automatic: + limit: 1 + manual: + allowed: true + +>>>>>>> 1f7703312 (pinned version (#7958)) - label: "Unit tests - Ubuntu 22.04 ARM64" key: "unit-tests-2204-arm64" command: ".buildkite/scripts/steps/unit-tests.sh" @@ -44,7 +94,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: @@ -63,7 +113,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" @@ -83,7 +133,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" @@ -143,7 +193,7 @@ 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: @@ -151,6 +201,7 @@ steps: limit: 1 manual: allowed: true + - label: "Unit tests - Windows 11" key: "unit-tests-win11" command: .buildkite/scripts/steps/unit-tests.ps1 @@ -161,7 +212,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: @@ -219,7 +270,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: @@ -263,7 +314,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 From 0de8a00348d6ef1af71074f14d46b2014dc19d96 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Thu, 24 Apr 2025 20:56:35 +0300 Subject: [PATCH 2/2] resolved conflicts --- .buildkite/pipeline.yml | 42 ----------------------------------------- 1 file changed, 42 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 6730cc4dba3..15aeb2d15c7 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -42,48 +42,6 @@ steps: manual: allowed: true -<<<<<<< HEAD -======= - - label: "Unit tests - Ubuntu 22.04 with requirefips build tag" - key: "unit-tests-2204-fips-tag" - command: ".buildkite/scripts/steps/unit-tests.sh" - env: - FIPS: "true" - artifact_paths: - - "build/TEST-*.html" - - "build/TEST-*.xml" - - "build/diagnostics/*" - - "coverage-*.out" - agents: - provider: "gcp" - image: "${IMAGE_UBUNTU_2204_X86_64}" - retry: - automatic: - limit: 1 - manual: - allowed: true - - - label: "Unit tests - fips140=only Ubuntu 22.04" - key: "unit-tests-2204-fips140-only" - command: ".buildkite/scripts/steps/unit-tests.sh" - env: - FIPS: "true" - GODEBUG: "fips140=only" - artifact_paths: - - "build/TEST-*.html" - - "build/TEST-*.xml" - - "build/diagnostics/*" - - "coverage-*.out" - agents: - provider: "gcp" - image: "${IMAGE_UBUNTU_2204_X86_64}" - retry: - automatic: - limit: 1 - manual: - allowed: true - ->>>>>>> 1f7703312 (pinned version (#7958)) - label: "Unit tests - Ubuntu 22.04 ARM64" key: "unit-tests-2204-arm64" command: ".buildkite/scripts/steps/unit-tests.sh"