Skip to content

Commit

Permalink
Fix stability issues with cross compilation in CI (#507)
Browse files Browse the repository at this point in the history
This commit fixes the instability we've been recently experienced described in: tonistiigi/binfmt#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: tonistiigi/binfmt#219

Additionally we switch to a more modern machine family than n1-standard-4 (default), but the root fix is the above one.
  • Loading branch information
dliappis authored Feb 11, 2025
1 parent 765cc6b commit a6daf2d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -28,6 +29,7 @@ steps:
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
instanceType: "${INSTANCE_TYPE_X86_64}"
matrix:
setup:
makefile:
Expand Down Expand Up @@ -79,6 +81,7 @@ steps:
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
instanceType: "${INSTANCE_TYPE_X86_64}"
matrix:
setup:
makefile:
Expand Down Expand Up @@ -130,3 +133,4 @@ steps:
agents:
provider: "gcp"
image: "${IMAGE_UBUNTU_X86_64}"
instanceType: "${INSTANCE_TYPE_X86_64}"
4 changes: 1 addition & 3 deletions .buildkite/scripts/buildx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit a6daf2d

Please sign in to comment.