From a6daf2dfa70ba4a62a43a87b4d10cabd2ee72f8c Mon Sep 17 00:00:00 2001
From: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Date: Tue, 11 Feb 2025 14:16:27 +0200
Subject: [PATCH] Fix stability issues with cross compilation in CI (#507)

This commit fixes the instability we've been recently experienced described in: https://github.com/tonistiigi/binfmt/issues/215

To allow cross platform builds we rely on https://github.com/tonistiigi/binfmt which recently addressed a flakyness issue
that landed on the `master` tag: https://github.com/tonistiigi/binfmt/pull/219

Additionally we switch to a more modern machine family than n1-standard-4 (default), but the root fix is the above one.
---
 .buildkite/pipeline.yml      | 6 +++++-
 .buildkite/scripts/buildx.sh | 4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 63733585..88c5fd43 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -2,7 +2,8 @@
 
 env:
   SETUP_GVM_VERSION: "v0.5.1"
-  IMAGE_UBUNTU_X86_64: "family/core-ubuntu-2204"
+  IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
+  INSTANCE_TYPE_X86_64: "n2-standard-4"
   IMAGE_UBUNTU_ARM_64: "core-ubuntu-2004-aarch64"
   DOCKER_REGISTRY: "docker.elastic.co"
   STAGING_IMAGE: "${DOCKER_REGISTRY}/observability-ci"
@@ -28,6 +29,7 @@ steps:
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
+          instanceType: "${INSTANCE_TYPE_X86_64}"
         matrix:
           setup:
             makefile:
@@ -79,6 +81,7 @@ steps:
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
+          instanceType: "${INSTANCE_TYPE_X86_64}"
         matrix:
           setup:
             makefile:
@@ -130,3 +133,4 @@ steps:
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
+          instanceType: "${INSTANCE_TYPE_X86_64}"
diff --git a/.buildkite/scripts/buildx.sh b/.buildkite/scripts/buildx.sh
index 77db6535..a6345ce4 100755
--- a/.buildkite/scripts/buildx.sh
+++ b/.buildkite/scripts/buildx.sh
@@ -4,11 +4,9 @@ set +x
 
 BUILDPLATFORM=${BUILDPLATFORM:-"linux/amd64,linux/arm64"}
 
-#docker run --privileged --rm tonistiigi/binfmt --install all
-docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 BUILDER_NAME="multibuilder${RANDOM}"
 echo "Add support for multiarch"
-docker run --privileged --rm tonistiigi/binfmt --install all
+docker run --privileged --rm tonistiigi/binfmt:master --install all
 
 docker buildx ls
 echo 'Create builder'