[1.22](backport #507) Fix stability issues with cross compilation in …

…CI (#514) Co-authored-by: Dimitrios Liappis <[email protected]>
elastic · Feb 11, 2025 · ead712f · ead712f
1 parent a38722b
commit ead712f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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"
@@ -27,6 +28,7 @@ steps:
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
+          instanceType: "${INSTANCE_TYPE_X86_64}"
         matrix:
           setup:
             makefile:
@@ -67,6 +69,7 @@ steps:
         agents:
           provider: "gcp"
           image: "${IMAGE_UBUNTU_X86_64}"
+          instanceType: "${INSTANCE_TYPE_X86_64}"
         matrix:
           setup:
             makefile:
@@ -108,3 +111,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
@@ -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'