Skip to content

Commit ead712f

Browse files
[1.22](backport #507) Fix stability issues with cross compilation in CI (#514)
Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
1 parent a38722b commit ead712f

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.buildkite/pipeline.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
env:
44
SETUP_GVM_VERSION: "v0.5.1"
5-
IMAGE_UBUNTU_X86_64: "family/core-ubuntu-2204"
5+
IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
6+
INSTANCE_TYPE_X86_64: "n2-standard-4"
67
IMAGE_UBUNTU_ARM_64: "core-ubuntu-2004-aarch64"
78
DOCKER_REGISTRY: "docker.elastic.co"
89
STAGING_IMAGE: "${DOCKER_REGISTRY}/observability-ci"
@@ -27,6 +28,7 @@ steps:
2728
agents:
2829
provider: "gcp"
2930
image: "${IMAGE_UBUNTU_X86_64}"
31+
instanceType: "${INSTANCE_TYPE_X86_64}"
3032
matrix:
3133
setup:
3234
makefile:
@@ -67,6 +69,7 @@ steps:
6769
agents:
6870
provider: "gcp"
6971
image: "${IMAGE_UBUNTU_X86_64}"
72+
instanceType: "${INSTANCE_TYPE_X86_64}"
7073
matrix:
7174
setup:
7275
makefile:
@@ -108,3 +111,4 @@ steps:
108111
agents:
109112
provider: "gcp"
110113
image: "${IMAGE_UBUNTU_X86_64}"
114+
instanceType: "${INSTANCE_TYPE_X86_64}"

.buildkite/scripts/buildx.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ set +x
44

55
BUILDPLATFORM=${BUILDPLATFORM:-"linux/amd64,linux/arm64"}
66

7-
#docker run --privileged --rm tonistiigi/binfmt --install all
8-
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
97
BUILDER_NAME="multibuilder${RANDOM}"
108
echo "Add support for multiarch"
11-
docker run --privileged --rm tonistiigi/binfmt --install all
9+
docker run --privileged --rm tonistiigi/binfmt:master --install all
1210

1311
docker buildx ls
1412
echo 'Create builder'

0 commit comments

Comments
 (0)