Skip to content

Commit 39d328d

Browse files
mnasiadkabbezak
authored andcommitted
CI: Fix aarch64 builds on x86 after switching to role
bf04bd90a15e7d3949214d15a8b8e25f2050bb65 omitted the --platform option Change-Id: I4febdf6b391bb7320ea30e1ca71fed81e332021d
1 parent 01515cd commit 39d328d

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

.zuul.d/centos.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
name: kolla-build-centos9s-aarch64
2424
parent: kolla-build-centos9s
2525
nodeset: kolla-centos-9-stream
26+
vars:
27+
base_arch: aarch64
2628
voting: false
2729

2830
- job:

.zuul.d/rocky.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
name: kolla-build-rocky9-aarch64
7171
parent: kolla-build-rocky9
7272
nodeset: kolla-rockylinux-9
73+
vars:
74+
base_arch: aarch64
7375
voting: false
7476

7577
- job:

.zuul.d/ubuntu.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
name: kolla-build-ubuntu-aarch64
7171
parent: kolla-build-ubuntu
7272
nodeset: kolla-ubuntu-noble
73+
vars:
74+
base_arch: aarch64
7375
voting: false
7476

7577
- job:

roles/kolla-build/tasks/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@
1212
--work-dir {{ kolla_build_logs_dir }}/work_dir
1313
1414
- name: Run kolla-build
15+
vars:
16+
platform: "{{ '--platform linux/arm64' if base_arch == 'aarch64' and base_arch != ansible_facts.architecture }}"
1517
ansible.builtin.command:
16-
cmd: "{{ kolla_build_venv_path }}/bin/kolla-build"
18+
cmd: "{{ kolla_build_venv_path }}/bin/kolla-build {{ platform }}"

0 commit comments

Comments
 (0)