Skip to content

Added binfmt to beats packaging step#42825

Merged
oakrizan merged 7 commits into
mainfrom
update-packaging
Feb 24, 2025
Merged

Added binfmt to beats packaging step#42825
oakrizan merged 7 commits into
mainfrom
update-packaging

Conversation

@oakrizan
Copy link
Copy Markdown
Contributor

@oakrizan oakrizan commented Feb 21, 2025 •
edited
Loading

Proposed commit message

Added binfmt docker to run before packaging for multiarch builds to avoid the exec format errors when attempting to build arm64 inside arm64 workers.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

Logs

Buildkite builds: https://buildkite.com/elastic/beats/builds?branch=elastic%3Aupdate-packaging

@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 21, 2025
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Feb 21, 2025

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @oakrizan? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@oakrizan oakrizan added ci Team:Ingest-EngProd backport-active-all Automated backport with mergify to all the active branches labels Feb 21, 2025
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 21, 2025
v1v
v1v reviewed Feb 21, 2025
View reviewed changes
Comment thread .buildkite/auditbeat/auditbeat-pipeline.yml Outdated
v1v
v1v requested changes Feb 21, 2025
View reviewed changes
Comment thread .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml Outdated
Comment thread .buildkite/scripts/packaging/packaging.sh Outdated
v1v
v1v reviewed Feb 21, 2025
View reviewed changes
Comment thread .buildkite/scripts/packaging/packaging.sh
@dliappis
Copy link
Copy Markdown
Contributor

dliappis commented Feb 21, 2025

@oakrizan the script isn't executable, hence it fails with https://buildkite.com/elastic/beats-xpack-dockerlogbeat/builds/9595#01952852-b647-4670-9a04-f7c2a77c7ac8/143-146

@oakrizan oakrizan requested review from dliappis and v1v February 21, 2025 16:45
@oakrizan oakrizan marked this pull request as ready for review February 21, 2025 16:45
@oakrizan oakrizan requested a review from a team as a code owner February 21, 2025 16:45
@oakrizan @v1v
Update .buildkite/scripts/packaging/packaging.sh
16ac1c2 
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
dliappis
dliappis approved these changes Feb 24, 2025
View reviewed changes
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.

LGTM

@oakrizan oakrizan merged commit 5409677 into main Feb 24, 2025
@oakrizan oakrizan deleted the update-packaging branch February 24, 2025 09:59
mergify Bot pushed a commit that referenced this pull request Feb 24, 2025
@oakrizan @dliappis
@v1v @mergify
Added binfmt to beats packaging step (#42825)
785a0b9 
Added binfmt docker to run before packaging for multiarch builds

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 5409677)
mergify Bot pushed a commit that referenced this pull request Feb 24, 2025
@oakrizan @dliappis
@v1v @mergify
Added binfmt to beats packaging step (#42825)
a0b873b 
Added binfmt docker to run before packaging for multiarch builds

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 5409677)
mergify Bot pushed a commit that referenced this pull request Feb 24, 2025
@oakrizan @dliappis
@v1v @mergify
Added binfmt to beats packaging step (#42825)
3ce0270 
Added binfmt docker to run before packaging for multiarch builds

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 5409677)
@mergify mergify Bot mentioned this pull request Feb 24, 2025
Merged
6 tasks
This was referenced Feb 24, 2025
Merged
Merged
mergify Bot pushed a commit that referenced this pull request Feb 24, 2025
@oakrizan @dliappis
@v1v @mergify
Added binfmt to beats packaging step (#42825)
1e62e19 
Added binfmt docker to run before packaging for multiarch builds

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 5409677)
mergify Bot pushed a commit that referenced this pull request Feb 24, 2025
@oakrizan @dliappis
@v1v @mergify
Added binfmt to beats packaging step (#42825)
723e0ca 
Added binfmt docker to run before packaging for multiarch builds

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 5409677)
This was referenced Feb 24, 2025
Merged
Merged
mergify Bot pushed a commit that referenced this pull request Feb 24, 2025
@oakrizan @mergify
Added binfmt to beats packaging step (#42825)
afb3c28 
Added binfmt docker to run before packaging for multiarch builds

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 5409677)

# Conflicts:
#	.buildkite/auditbeat/auditbeat-pipeline.yml
#	.buildkite/x-pack/pipeline.xpack.agentbeat.yml
#	.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
@mergify mergify Bot mentioned this pull request Feb 24, 2025
Merged
6 tasks
@dliappis dliappis mentioned this pull request Feb 24, 2025
Merged
6 tasks
oakrizan added a commit that referenced this pull request Feb 24, 2025
@mergify @oakrizan
Added binfmt to beats packaging step (#42825) (#42856)
5b2019c 
Added binfmt docker to run before packaging for multiarch builds

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 5409677)

Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
oakrizan added a commit that referenced this pull request Feb 24, 2025
@mergify @oakrizan
Added binfmt to beats packaging step (#42825) (#42857)
07600bd 
Added binfmt docker to run before packaging for multiarch builds

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 5409677)

Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
oakrizan added a commit that referenced this pull request Feb 25, 2025
@mergify @oakrizan
[7.17](backport #42825) Added binfmt to beats packaging step (#42861)
87416ed 
* Added binfmt to beats packaging step (#42825)
---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 5409677)

# Conflicts:
#	.buildkite/auditbeat/auditbeat-pipeline.yml
#	.buildkite/x-pack/pipeline.xpack.agentbeat.yml
#	.buildkite/x-pack/pipeline.xpack.winlogbeat.yml

* resolved conflicts

* deleted xpack-agentbeat pipeline

* updated x-pack/winlogbeat packaging env vars

---------

Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
oakrizan added a commit that referenced this pull request Feb 25, 2025
@mergify @oakrizan
Added binfmt to beats packaging step (#42825) (#42860)
b76b07d 
Added binfmt docker to run before packaging for multiarch builds

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 5409677)

Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
oakrizan added a commit that referenced this pull request Feb 25, 2025
@mergify @oakrizan
Added binfmt to beats packaging step (#42825) (#42859)
a33e883 
Added binfmt docker to run before packaging for multiarch builds

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 5409677)

Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
oakrizan added a commit that referenced this pull request Feb 26, 2025
@mergify @dliappis
@v1v @oakrizan
[8.17](backport #42825) Added binfmt to beats packaging step (#42858)
7ce87b1 
* Added binfmt to beats packaging step (#42825)

Added binfmt docker to run before packaging for multiarch builds

---------

Co-authored-by: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 5409677)
Co-authored-by: Olga Naydyonock <olga.naidjonoka@elastic.co>
@oakrizan oakrizan mentioned this pull request Mar 5, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@v1v v1v v1v approved these changes

+1 more reviewer

@dliappis dliappis dliappis approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@oakrizan oakrizan

Labels

backport-active-all Automated backport with mergify to all the active branches ci Team:Ingest-EngProd

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@oakrizan @dliappis @v1v