Skip to content

[7.x](backport #25987) fix: use new ARM crossbuild docker images#26128

Merged
kuisathaverat merged 1 commit into7.xfrom
mergify/bp/7.x/pr-25987
Jun 24, 2021
Merged

[7.x](backport #25987) fix: use new ARM crossbuild docker images#26128
kuisathaverat merged 1 commit into7.xfrom
mergify/bp/7.x/pr-25987

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 3, 2021

This is an automatic backport of pull request #25987 done by Mergify.
Cherry-pick of 7426f67 has failed:

On branch mergify/bp/7.x/pr-25987
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 7426f67d6.
  (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:   dev-tools/mage/crossbuild.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .ci/packer_cache.sh

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* fix: use new ARM crossbuild docker images

* fix: enable ARMv7 package

* fix: use base-arm-debian9 only on ARM64 hosts

* chore: re-disable amrv7

* fix: linting issue

(cherry picked from commit 7426f67)

# Conflicts:
#	.ci/packer_cache.sh
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 3, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 3, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 3, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: jsoriano commented: /test

  • Start Time: 2021-06-24T11:41:22.640+0000

  • Duration: 146 min 40 sec

  • Commit: 26b0443

Test stats 🧪

Test Results
Failed 0
Passed 47626
Skipped 5225
Total 52851

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 47626
Skipped 5225
Total 52851

@jsoriano
Copy link
Copy Markdown
Member

Hey @kuisathaverat, can this backport be merged? Thanks!

@jsoriano
Copy link
Copy Markdown
Member

/test

@jsoriano jsoriano added the Team:Automation Label for the Observability productivity team label Jun 24, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 24, 2021
@kuisathaverat kuisathaverat merged commit 1f436a2 into 7.x Jun 24, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-25987 branch June 24, 2021 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request Team:Automation Label for the Observability productivity team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants