diff options
| author | fanquake <fanquake@gmail.com> | 2023-08-09 11:46:01 +0200 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-08-09 12:09:00 +0200 |
| commit | 492257019d6d6e0f4051433e510502e8040fd6d2 (patch) | |
| tree | 7ee41238994e0b2bbef088e11ffe5e841c729728 /contrib | |
| parent | b565485c24c0feacae559a7f6f7b83d7516ca58d (diff) | |
| parent | fad0b67c212dcb8a16fcbda5a74acc959ed4e284 (diff) | |
Merge bitcoin/bitcoin#28087: ci: Use qemu-user through container engine
fad0b67c212dcb8a16fcbda5a74acc959ed4e284 ci: Use qemu-user through container engine (MarcoFalke)
Pull request description:
Currently the CI containers always run on the host architecture, and only wrap `bitcoind` into `qemu-user` when needed. This has many issues:
* The `i386` tasks can not be run on non-x86 hosts.
* `config.guess` isn't present when building the CI image, which is fine. But it prints a warning, see https://github.com/bitcoin/bitcoin/pull/27739#pullrequestreview-1446580353
* The python tests are run on the host architecture, making it harder to find architecture specific bugs. See for example https://github.com/bitcoin/bitcoin/pull/27529#issuecomment-1521387810
* All modern container engines support automatic dispatch to qemu-user, so it seems redundant to re-invent the wheel.
Fix all issues by:
* removing `HOST` from `ci/test/00_setup_env.sh`.
* removing `QEMU_USER_CMD` and `ci/test/wrap-qemu.sh`.
* removing `DPKG_ADD_ARCH` where possible, and pruning `PACKAGES` where possible.
* specifying the architecture in `CI_IMAGE_NAME_TAG` to be used by the container engine.
ACKs for top commit:
fanquake:
ACK fad0b67c212dcb8a16fcbda5a74acc959ed4e284 - this seems ok to me, and removes complexity from our CI system.
Tree-SHA512: 85e79f9f570e292d70a629d112fd4a6e6217d96226a1b665ed13485f616d84720ad2126b7d4b22fc603049f72fa7f2163b56a6bc276319fcd8b0496304ea4157
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions