From fb57512a5ce7ad9cacce2938b3cb7661e4cd41b0 Mon Sep 17 00:00:00 2001 From: Fae Charlton Date: Thu, 20 Mar 2025 16:31:00 -0400 Subject: [PATCH 1/2] Revert "bk(dra): split arm64 for linux and darwin from amd64 (#43387)" This reverts commit 3823c011d98a5688c2bc9f2dd14852befdac9e0a. --- .buildkite/packaging.pipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.buildkite/packaging.pipeline.yml b/.buildkite/packaging.pipeline.yml index ebc9b4e41b7d..6ab52b54a10f 100644 --- a/.buildkite/packaging.pipeline.yml +++ b/.buildkite/packaging.pipeline.yml @@ -121,7 +121,7 @@ steps: - x-pack/packetbeat - x-pack/winlogbeat - - label: "SNAPSHOT: {{matrix}} Linux/arm64 and Darwin/arm64" + - label: "SNAPSHOT: {{matrix}} Linux/arm64" env: PLATFORMS: "${PLATFORMS_ARM}" SNAPSHOT: true @@ -154,7 +154,7 @@ steps: - x-pack/agentbeat ## Agentbeat needs more CPUs because it builds many other beats - - label: "SNAPSHOT: x-pack/agentbeat all artifacts apart from linux/arm64 and darwin/arm64" + - label: "SNAPSHOT: x-pack/agentbeat all artifacts apart from linux/arm64" env: PLATFORMS: "${PLATFORMS}" SNAPSHOT: true @@ -212,7 +212,7 @@ steps: - x-pack/packetbeat - x-pack/winlogbeat - - label: "STAGING: {{matrix}} Linux/arm64 and Darwin/arm64" + - label: "STAGING: {{matrix}} Linux/arm64" env: PLATFORMS: "${PLATFORMS_ARM}" SNAPSHOT: false @@ -246,7 +246,7 @@ steps: - x-pack/agentbeat ## Agentbeat needs more CPUs because it builds many other beats - - label: "STAGING: x-pack/agentbeat all artifacts apart from linux/arm64 and darwin/arm64" + - label: "STAGING: x-pack/agentbeat all artifacts apart from linux/arm64" env: PLATFORMS: "${PLATFORMS}" SNAPSHOT: false From c39bedc09763baa5039e315552855a12386f8463 Mon Sep 17 00:00:00 2001 From: Fae Charlton Date: Thu, 20 Mar 2025 16:42:11 -0400 Subject: [PATCH 2/2] manually fix broken rollback patch --- .buildkite/packaging.pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/packaging.pipeline.yml b/.buildkite/packaging.pipeline.yml index 6ab52b54a10f..6063cd8c7164 100644 --- a/.buildkite/packaging.pipeline.yml +++ b/.buildkite/packaging.pipeline.yml @@ -8,8 +8,8 @@ env: GCP_DEFAULT_MACHINE_TYPE: "c2d-standard-8" IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204" - PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64" - PLATFORMS_ARM: "+all linux/arm64 darwin/arm64" + PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64" + PLATFORMS_ARM: "+all linux/arm64" steps: # we use concurrency gates (https://buildkite.com/blog/concurrency-gates)