From 9b10b7d23579c0d06aa4b75b456f42d4116951f9 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Tue, 1 Oct 2024 16:04:51 +0200
Subject: [PATCH] CI: Fix aarch64 publish jobs on x86

Change-Id: I5c69d288a427d708b42deadac872a3a7368181e3
---
 .zuul.d/base.yaml       | 1 +
 tests/playbooks/run.yml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index bf012877d1..df550672bd 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -139,6 +139,7 @@
       - ^LICENSE$
       - ^tox\.ini$
     vars:
+      base_arch: "x86_64"
       publisher: false
       container_engine: "docker"
     extra-vars:
diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml
index 78ff3ea2e9..c9f5fa1a04 100644
--- a/tests/playbooks/run.yml
+++ b/tests/playbooks/run.yml
@@ -3,14 +3,14 @@
   vars_files:
     - ../vars/zuul.yml
   vars:
-    tag_suffix: "{{ '-aarch64' if ansible_architecture == 'aarch64' else '' }}"
+    tag_suffix: "{{ '-aarch64' if base_arch == 'aarch64' else '' }}"
     kolla_build_config:
       DEFAULT:
         debug: true
         logs_dir: "{{ kolla_build_logs_dir }}"
         quiet: true
         base: "{{ base_distro }}"
-        base_arch: "{{ base_arch | default('x86_64') }}"
+        base_arch: "{{ base_arch }}"
         engine: "{{ container_engine }}"
         template_override: /etc/kolla/template_overrides.j2
         # NOTE(yoctozepto): to avoid issues with IPv6 not enabled in the docker daemon