Skip to content

[7.17](backport #42825) Added binfmt to beats packaging step#42861

Merged
oakrizan merged 4 commits into
7.17from
mergify/bp/7.17/pr-42825
Feb 25, 2025
Merged

[7.17](backport #42825) Added binfmt to beats packaging step#42861
oakrizan merged 4 commits into
7.17from
mergify/bp/7.17/pr-42825

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Feb 24, 2025

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


This is an automatic backport of pull request #42825 done by [Mergify](https://mergify.com).

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 added backport conflicts There is a conflict in the backported pull request labels Feb 24, 2025
@mergify mergify Bot requested a review from a team as a code owner February 24, 2025 10:03
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 24, 2025

Cherry-pick of 5409677 has failed:

On branch mergify/bp/7.17/pr-42825
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 5409677da.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .buildkite/filebeat/filebeat-pipeline.yml
	modified:   .buildkite/heartbeat/heartbeat-pipeline.yml
	modified:   .buildkite/metricbeat/pipeline.yml
	modified:   .buildkite/packetbeat/pipeline.packetbeat.yml
	new file:   .buildkite/scripts/packaging/packaging.sh
	modified:   .buildkite/winlogbeat/pipeline.winlogbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.auditbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.filebeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.heartbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.metricbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.osquerybeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.packetbeat.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .buildkite/auditbeat/auditbeat-pipeline.yml
	deleted by us:   .buildkite/x-pack/pipeline.xpack.agentbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.winlogbeat.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 24, 2025
@oakrizan oakrizan added ci Team:Ingest-EngProd and removed conflicts There is a conflict in the backported pull request labels Feb 24, 2025
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 24, 2025
@oakrizan oakrizan requested review from dliappis and v1v February 24, 2025 12:26
Comment thread .buildkite/x-pack/pipeline.xpack.winlogbeat.yml Outdated
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

@dliappis dliappis mentioned this pull request Feb 25, 2025
6 tasks
@oakrizan oakrizan merged commit 87416ed into 7.17 Feb 25, 2025
@oakrizan oakrizan deleted the mergify/bp/7.17/pr-42825 branch February 25, 2025 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants