Revert "bk(dra): split arm64 for linux and darwin from amd64"

[faec]

Reverts #43387

This PR is breaking the metricbeat packaging (https://buildkite.com/elastic/beats-xpack-metricbeat/builds/13512#0195b4ca-f2d5-44f7-8e12-486a28814556) and crosscompile (https://buildkite.com/elastic/beats-metricbeat/builds/15782#0195b4ea-77a7-482c-be10-f27ea95bd74f) tests. A dependency check bug seems to have skipped those tests (and most others) on the PR's CI, which made it appear green before merge.

[botelastic]

This pull request doesn't have a Team:<team> label.

[mergify]

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @faec? 🙏.
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.

[v1v]

Wait, we are merging things, so there might be instability, but this should not be done now

[v1v]

We have probably forgot to say that we are working on it:

Status for Beats:

• 9.0 - packaging -> https://github.com/elastic/beats/pull/43397/files
• 8.x - packaging -> [8.x](backport #43280) bk(packaging): use arm64 for darwin/arm64 #43395 (Blocked until merged a previous PR)
• 9.0 - DRA -> [9.0](backport #43387) bk(dra): split arm64 for linux and darwin from amd64 #43400 (comment)
• 8.x - DRA -> [8.x](backport #43387) bk(dra): split arm64 for linux and darwin from amd64 #43398 (comment)
• [8.x](backport #43170) ci(bk package jobs): Don't package arm64 on amd64 workers #43245 is needed too

In your case the failure is about a PR in one of those branches.

Sorry for the noise, but we are actually working as we speak

[v1v]

d crosscompile (buildkite.com/elastic/beats-metricbeat/builds/15782#0195b4ea-77a7-482c-be10-f27ea95bd74f) tests.

That's in main, interestingly it has not been found in those PRs:

• bk(dra): split arm64 for linux and darwin from amd64 #43387
• bk(packaging): use arm64 for darwin/arm64 #43280

So we need some help so we can keep using the approach we have done so far:

• refactor golang-crossbuild to support darwin/arm64 for Debian 11 on arm64
• changes in Beats
• changes in Elastic Agent

[faec]

The crosscompile failures were in the main branch (on #43394), but I will rerun the tests there to see if they're working again now

[v1v]

The crosscompile failures were in the main branch (on #43394), but I will rerun the tests there to see if they're working again now

If it works in main:

• https://github.com/elastic/beats/commits/main/
• see https://buildkite.com/elastic/beats-metricbeat/builds/15784#0195b4e1-65d5-4d79-b800-b6e476383073

Maybe it's something with your PR or maybe it's not up-to-date?

[faec]

That's in main, interestingly it has not been found in those PRs:

@v1v The split PR looks like it didn't actually run those tests before merge, which I think was an error in the CI itself? But it does seem to have passed on its post-merge run in main. If it doesn't happen anymore then the rollback is unnecessary :-)

[v1v]

Thanks @faec for double-checking and so sorry for missing the way to communicate this!! 🥺

[v1v]

@v1v The split PR looks like it didn't actually run those tests before merge, which I think was an error in the CI itself?

There are two PRs:

1. One related to the packaging on PRs.
2. One related to the DRA.

In both cases, we changed in the golang-crossbuild the support for darwin/arm64 on arm64, that's an independent change and it was done about 2 hours ago (as a prerequisite for those PRs):

• elastic/golang-crossbuild@55f0f22

That change forced us to use darwin/arm64 for arm64 in the consumers, hence the changes in the above-mentioned PRs.

#43387 didn't test anything because for some reason the CI has not been configured to test changes in that pipeline, as far as I understood (why? no clue, that's something I have not been involved). However,
#43280 , that one ran the crosscompile for metricbeats:

• https://buildkite.com/elastic/beats-metricbeat/builds/15745#0195b329-8591-4269-a8a6-46df24979926

I hope I clarified a bit the context, but If I missed something please let me know, just in case something else is not right! Thanks again @faec

[mergify]

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b revert-43387-feature/dra-packaging-split-arm64 upstream/revert-43387-feature/dra-packaging-split-arm64
git merge upstream/main
git push upstream revert-43387-feature/dra-packaging-split-arm64

[dliappis]

@pkoutsovasilis / @v1 Is this something we can close?

[pkoutsovasilis]

IMO this can be closed 🙂