Skip to content

Commit 7f8d86f

Browse files
mergify[bot]swiatekmgithub-actions[bot]
authored
Disable docker containerd snapshotter in CI (#11774) (#11855)
* chore: Update .buildkite/bk.integration-fips.pipeline.yml Made with ❤️️ by updatecli * chore: Update .buildkite/pipeline.yml Made with ❤️️ by updatecli # Conflicts: # .buildkite/pipeline.yml * chore: Update .buildkite/pipeline.elastic-agent-binary-dra.yml Made with ❤️️ by updatecli * chore: Update .buildkite/pipeline.elastic-agent-package.yml Made with ❤️️ by updatecli * chore: Update .buildkite/bk.integration.pipeline.yml Made with ❤️️ by updatecli * chore: Update .buildkite/integration.pipeline.yml Made with ❤️️ by updatecli * Disable docker containerd snapshotter * Make docker output less verbose in packaging pipeline --------- (cherry picked from commit 5324e95) Co-authored-by: Mikołaj Świątek <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 77212e1 commit 7f8d86f

File tree

7 files changed

+42
-21
lines changed

7 files changed

+42
-21
lines changed

‎.buildkite/bk.integration-fips.pipeline.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ env:
44
ASDF_MAGE_VERSION: 1.14.0
55
MS_GOTOOLCHAIN_TELEMETRY_ENABLED: "0"
66

7-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1762801856"
8-
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1762801856"
9-
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1762801856"
7+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1764775167"
8+
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1764775167"
9+
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1764775167"
1010
ASDF_TERRAFORM_VERSION: 1.9.2
1111

1212
# This section is used to define the plugins that will be used in the pipeline.

‎.buildkite/bk.integration.pipeline.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ env:
66

77
# The following images are defined here and their values will be updated by updatecli
88
# Please do not change them manually.
9-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1762801856"
10-
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1762801856"
11-
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1762801856"
12-
IMAGE_RHEL_10: "platform-ingest-elastic-agent-rhel-10-1762801856"
13-
IMAGE_DEBIAN_11: "platform-ingest-elastic-agent-debian-11-1762801856"
14-
IMAGE_DEBIAN_13: "platform-ingest-elastic-agent-debian-13-1762801856"
15-
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1762801856"
16-
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1762801856"
9+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1764775167"
10+
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1764775167"
11+
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1764775167"
12+
IMAGE_RHEL_10: "platform-ingest-elastic-agent-rhel-10-1764775167"
13+
IMAGE_DEBIAN_11: "platform-ingest-elastic-agent-debian-11-1764775167"
14+
IMAGE_DEBIAN_13: "platform-ingest-elastic-agent-debian-13-1764775167"
15+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1764775167"
16+
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1764775167"
1717
ASDF_TERRAFORM_VERSION: 1.9.2
1818

1919
# This section is used to define the plugins that will be used in the pipeline.

‎.buildkite/integration.pipeline.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ env:
99

1010
# The following images are defined here and their values will be updated by updatecli
1111
# Please do not change them manually.
12-
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1762801856"
13-
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1762801856"
12+
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1764775167"
13+
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1764775167"
1414

1515
common:
1616
- vault_docker_login: &vault_docker_login

‎.buildkite/pipeline.elastic-agent-binary-dra.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ env:
99

1010
# The following images are defined here and their values will be updated by updatecli
1111
# Please do not change them manually.
12-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1762801856"
13-
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1762801856"
12+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1764775167"
13+
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1764775167"
1414

1515
# This section is used to define the plugins that will be used in the pipeline.
1616
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins

‎.buildkite/pipeline.elastic-agent-package.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ env:
55
# after moving elastic-agent out of beats, we should update the URL of the packaging.
66
BEAT_URL: "https://www.elastic.co/elastic-agent"
77

8+
# Make Docker builds less verbose
9+
BUILDKIT_PROGRESS: plain
10+
811
# The following images are defined here and their values will be updated by updatecli
912
# Please do not change them manually.
10-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1762801856"
11-
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1762801856"
13+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1764775167"
14+
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1764775167"
1215

1316
steps:
1417
- input: "Build parameters"

‎.buildkite/pipeline.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ env:
55

66
# The following images are defined here and their values will be updated by updatecli
77
# Please do not change them manually.
8-
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1762801856"
9-
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1762801856"
10-
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1762801856"
11-
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1762801856"
8+
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1764775167"
9+
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1764775167"
10+
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1764775167"
11+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1764775167"
1212
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1764775167"
1313
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1764775167"
1414

‎.buildkite/scripts/common.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,24 @@ if [[ -z "${BEAT_VERSION-""}" ]]; then
1515
export BEAT_VERSION
1616
fi
1717

18+
# Disable the containerd snapshotter, as it affects the output of docker save.
19+
# See https://github.com/elastic/elastic-agent/issues/11604
20+
docker_disable_containerd_snapshotter() {
21+
if ! systemctl is-enabled docker; then
22+
return 0
23+
fi
24+
cat << EOF | sudo tee /etc/docker/daemon.json >/dev/null
25+
{
26+
"features": {
27+
"containerd-snapshotter": false
28+
}
29+
}
30+
EOF
31+
sudo systemctl restart docker
32+
}
33+
34+
docker_disable_containerd_snapshotter
35+
1836
getOSOptions() {
1937
case $(uname | tr '[:upper:]' '[:lower:]') in
2038
linux*)

0 commit comments

Comments
 (0)