diff options
| author | Zuul <zuul@review.opendev.org> | 2024-09-30 15:14:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-09-30 15:14:15 +0000 |
| commit | 694cb421b5ab914a4fbb672ac0a927bfee29a32a (patch) | |
| tree | 09386f0c161ec203bb5ff009d994eb2ecbf14196 | |
| parent | 533bd2125df2bf6c283cb2141fc4d63b8a8426e8 (diff) | |
| parent | af3a4bbf608d6469e0d375ee8a7a8bad61360b29 (diff) | |
| download | kolla-694cb421b5ab914a4fbb672ac0a927bfee29a32a.tar.gz kolla-694cb421b5ab914a4fbb672ac0a927bfee29a32a.zip | |
Merge "CI: Build aarch64 images on x86"
| -rw-r--r-- | .zuul.d/debian.yaml | 5 | ||||
| -rw-r--r-- | tests/playbooks/pre.yml | 6 | ||||
| -rw-r--r-- | tests/playbooks/run.yml | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml index 23584d46b..e4f0fe3c4 100644 --- a/.zuul.d/debian.yaml +++ b/.zuul.d/debian.yaml @@ -49,8 +49,11 @@ - job: name: kolla-build-debian-aarch64 parent: kolla-build-debian - nodeset: kolla-debian-bookworm-aarch64 + # NOTE(mnasiadka): Switch to aarch64 nodeset when nodes are fixed + nodeset: kolla-debian-bookworm voting: false + vars: + base_arch: aarch64 - job: name: kolla-publish-debian-dockerhub diff --git a/tests/playbooks/pre.yml b/tests/playbooks/pre.yml index 7e44c87aa..cee184b0a 100644 --- a/tests/playbooks/pre.yml +++ b/tests/playbooks/pre.yml @@ -201,3 +201,9 @@ become: true when: - container_engine == "podman" + + - name: Run multiarch/qemu-user-static image to support cross-arch build + command: + cmd: "{{ container_engine }} run --rm --privileged multiarch/qemu-user-static --reset -p yes" + become: true + when: ansible_facts.architecture != (base_arch | default('x86_64')) diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml index e21c19f21..78ff3ea2e 100644 --- a/tests/playbooks/run.yml +++ b/tests/playbooks/run.yml @@ -10,6 +10,7 @@ logs_dir: "{{ kolla_build_logs_dir }}" quiet: true base: "{{ base_distro }}" + base_arch: "{{ base_arch | default('x86_64') }}" engine: "{{ container_engine }}" template_override: /etc/kolla/template_overrides.j2 # NOTE(yoctozepto): to avoid issues with IPv6 not enabled in the docker daemon |