From 39d328da32524aef5c1bcd3435f26869c9daa9cf Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 3 Oct 2024 11:46:48 +0200 Subject: CI: Fix aarch64 builds on x86 after switching to role bf04bd90a15e7d3949214d15a8b8e25f2050bb65 omitted the --platform option Change-Id: I4febdf6b391bb7320ea30e1ca71fed81e332021d --- .zuul.d/centos.yaml | 2 ++ .zuul.d/rocky.yaml | 2 ++ .zuul.d/ubuntu.yaml | 2 ++ roles/kolla-build/tasks/main.yml | 4 +++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 3eda4a1bc..b375477d1 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -23,6 +23,8 @@ name: kolla-build-centos9s-aarch64 parent: kolla-build-centos9s nodeset: kolla-centos-9-stream + vars: + base_arch: aarch64 voting: false - job: diff --git a/.zuul.d/rocky.yaml b/.zuul.d/rocky.yaml index fbe3b4cf3..452a2eafa 100644 --- a/.zuul.d/rocky.yaml +++ b/.zuul.d/rocky.yaml @@ -70,6 +70,8 @@ name: kolla-build-rocky9-aarch64 parent: kolla-build-rocky9 nodeset: kolla-rockylinux-9 + vars: + base_arch: aarch64 voting: false - job: diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index 4cb303c24..a77c3335a 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -70,6 +70,8 @@ name: kolla-build-ubuntu-aarch64 parent: kolla-build-ubuntu nodeset: kolla-ubuntu-noble + vars: + base_arch: aarch64 voting: false - job: diff --git a/roles/kolla-build/tasks/main.yml b/roles/kolla-build/tasks/main.yml index 329507b31..ec09e4f79 100644 --- a/roles/kolla-build/tasks/main.yml +++ b/roles/kolla-build/tasks/main.yml @@ -12,5 +12,7 @@ --work-dir {{ kolla_build_logs_dir }}/work_dir - name: Run kolla-build + vars: + platform: "{{ '--platform linux/arm64' if base_arch == 'aarch64' and base_arch != ansible_facts.architecture }}" ansible.builtin.command: - cmd: "{{ kolla_build_venv_path }}/bin/kolla-build" + cmd: "{{ kolla_build_venv_path }}/bin/kolla-build {{ platform }}" -- cgit v1.2.3