Skip to content

ci: split debian 11 amd/arm#533

Merged
v1v merged 16 commits intoelastic:mainfrom
v1v:feature/debian-11-aarch-specific
Mar 20, 2025
Merged

ci: split debian 11 amd/arm#533
v1v merged 16 commits intoelastic:mainfrom
v1v:feature/debian-11-aarch-specific

Conversation

@v1v
Copy link
Copy Markdown
Member

@v1v v1v commented Mar 5, 2025

Add support for arm64-specific docker images in Debian 11 on arm64
Adapt CI for running OS specific for Debian 11.

Uses https://github.com/elastic/golang-crossbuild/pull/524/files#diff-78f24cf6131fffe363db9182e23c8e5ff491034e44c49dfc5678bb85ed5146e8R1

@mergify
Copy link
Copy Markdown

mergify Bot commented Mar 5, 2025

This pull request does not have a backport label. Could you fix it @v1v? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d is the label to automatically backport to the 1./d branch. /d is the digit
    NOTE: backport-skip has been added to this pull request.

@mergify mergify Bot added the backport-skip label Mar 5, 2025
@v1v v1v changed the title ci: decompose arm debian 11 from the qemu approach ci: split debian 11 amd/arm Mar 5, 2025
Comment thread go/base-arm/sources-debian11.list Outdated
@@ -0,0 +1,2 @@
deb http://deb.debian.org/debian bullseye main
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See

docker run --rm -ti arm64v8/debian:11 /bin/bash
root@2ea37445e422:/# cat /etc/apt/sources.list
# deb http://snapshot.debian.org/archive/debian/20250224T000000Z bullseye main
deb http://deb.debian.org/debian bullseye main
# deb http://snapshot.debian.org/archive/debian-security/20250224T000000Z bullseye-security main
deb http://deb.debian.org/debian-security bullseye-security main
# deb http://snapshot.debian.org/archive/debian/20250224T000000Z bullseye-updates main
deb http://deb.debian.org/debian bullseye-updates main

Comment thread go/base-arm/Dockerfile.tmpl Outdated
Comment on lines +30 to +36
{{- if (ne .DEBIAN_VERSION "11") }}
libicu57 \
librpm3 \
librpmio3 \
librpmbuild3 \
librpmsign3 \
{{- end }}
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes

2025-03-06 17:26:09 CEST | 3.062 Calculating upgrade...
-- | --
  | 2025-03-06 17:26:09 CEST | 3.446 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
  | 2025-03-06 17:26:09 CEST | 4.456 E: Unable to locate package libicu57
  | 2025-03-06 17:26:09 CEST | 4.456 E: Unable to locate package librpm3
  | 2025-03-06 17:26:09 CEST | 4.456 E: Unable to locate package librpmio3
  | 2025-03-06 17:26:09 CEST | 4.456 E: Unable to locate package librpmbuild3
  | 2025-03-06 17:26:09 CEST | 4.456 E: Unable to locate package librpmsign3
  | 2025-03-06 17:26:09 CEST | ------
  | 2025-03-06 17:26:09 CEST | Dockerfile:8

those packages as far as I see are specific per platform and they are not available in debian 11

Comment thread go/Makefile.debian11 Outdated
@@ -1,4 +1,5 @@
IMAGES := base main darwin arm armhf darwin-arm64 npcap
IMAGES := base main darwin armhf darwin-arm64 npcap
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@v1v v1v marked this pull request as ready for review March 6, 2025 18:09
@v1v v1v requested review from a team as code owners March 6, 2025 18:09
@v1v v1v requested review from kaanyalti and pkoutsovasilis March 6, 2025 18:09
@v1v v1v added backport-v1.23 Automated backport to the 1.23 Branch with mergify and removed backport-skip labels Mar 6, 2025
kuisathaverat
kuisathaverat previously approved these changes Mar 6, 2025
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Mar 7, 2025
dliappis
dliappis previously approved these changes Mar 10, 2025
Copy link
Copy Markdown
Contributor

@dliappis dliappis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Victor!

This LGTM, but let's do some additional validations using the staging docker images under docker.elastic.co/observability-ci/golang-crossbuild e.g. docker.elastic.co/observability-ci/golang-crossbuild:1.24.1-base-arm-debian11 while testing packaging in PRs and dra jobs in beats/elastic-agent

@v1v
Copy link
Copy Markdown
Member Author

v1v commented Mar 10, 2025

This LGTM, but let's do some additional validations using the staging docker images under docker.elastic.co/observability-ci/golang-crossbuild e.g. docker.elastic.co/observability-ci/golang-crossbuild:1.24.1-base-arm-debian11 while testing packaging in PRs and dra jobs in beats/elastic-agent

See elastic/elastic-agent#7304 and elastic/beats#43145

I'll validate whether the same number of artefacts are produced and no failures during the packaging

@v1v v1v merged commit 6d5d336 into elastic:main Mar 20, 2025
10 checks passed
@v1v
Copy link
Copy Markdown
Member Author

v1v commented Mar 20, 2025

@Mergifyio backport 1.24.0.x

@mergify
Copy link
Copy Markdown

mergify Bot commented Mar 20, 2025

backport 1.24.0.x

✅ Backports have been created

Details

mergify Bot pushed a commit that referenced this pull request Mar 20, 2025
Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
(cherry picked from commit 6d5d336)
mergify Bot pushed a commit that referenced this pull request Mar 20, 2025
Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
(cherry picked from commit 6d5d336)
v1v added a commit that referenced this pull request Mar 20, 2025
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
pchila added a commit that referenced this pull request Mar 24, 2025
v1v added a commit that referenced this pull request Mar 24, 2025
pchila added a commit that referenced this pull request Mar 25, 2025
pchila added a commit that referenced this pull request Mar 25, 2025
v1v added a commit to v1v/golang-crossbuild that referenced this pull request Apr 8, 2025
Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
(cherry picked from commit 6d5d336)
v1v added a commit to v1v/golang-crossbuild that referenced this pull request Apr 8, 2025
Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
v1v added a commit that referenced this pull request Apr 8, 2025
Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
v1v added a commit that referenced this pull request Apr 8, 2025
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-v1.23 Automated backport to the 1.23 Branch with mergify Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants