Skip to content

Commit 694cb42

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "CI: Build aarch64 images on x86"
2 parents 533bd21 + af3a4bb commit 694cb42

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

.zuul.d/debian.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,11 @@
4949
- job:
5050
name: kolla-build-debian-aarch64
5151
parent: kolla-build-debian
52-
nodeset: kolla-debian-bookworm-aarch64
52+
# NOTE(mnasiadka): Switch to aarch64 nodeset when nodes are fixed
53+
nodeset: kolla-debian-bookworm
5354
voting: false
55+
vars:
56+
base_arch: aarch64
5457

5558
- job:
5659
name: kolla-publish-debian-dockerhub

tests/playbooks/pre.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,3 +201,9 @@
201201
become: true
202202
when:
203203
- container_engine == "podman"
204+
205+
- name: Run multiarch/qemu-user-static image to support cross-arch build
206+
command:
207+
cmd: "{{ container_engine }} run --rm --privileged multiarch/qemu-user-static --reset -p yes"
208+
become: true
209+
when: ansible_facts.architecture != (base_arch | default('x86_64'))

tests/playbooks/run.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
logs_dir: "{{ kolla_build_logs_dir }}"
1111
quiet: true
1212
base: "{{ base_distro }}"
13+
base_arch: "{{ base_arch | default('x86_64') }}"
1314
engine: "{{ container_engine }}"
1415
template_override: /etc/kolla/template_overrides.j2
1516
# NOTE(yoctozepto): to avoid issues with IPv6 not enabled in the docker daemon

0 commit comments

Comments
 (0)