From 3d653038dc72fa344ddb34e306fb52e2a75c6579 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Thu, 9 Apr 2020 16:27:11 +0200
Subject: [PATCH] CI: do not build images on aarch64

We publish those images for a while.

Change-Id: Ifc157b43e87e4f77a1c70d98343bd0ef9cc0de79
---
 tests/run.yml                      | 9 ++-------
 tests/templates/globals-default.j2 | 3 +++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/run.yml b/tests/run.yml
index 78eca77131..e1d13b5cd5 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -28,6 +28,7 @@
         # TODO(mgoddard): Remove when previous_release is ussuri.
         playbook_python_version: "{{ '2' if is_upgrade and previous_release == 'train' and not is_centos8 else '3' }}"
         upper_constraints_file: "{{ ansible_env.HOME }}/src/opendev.org/openstack/requirements/upper-constraints.txt"
+        docker_image_tag_suffix: "{{ '-aarch64' if ansible_architecture == 'aarch64' else '' }}"
 
     - name: Install xfsprogs package for Swift filesystems
       become: true
@@ -54,12 +55,6 @@
         - item.branch == zuul.branch
       with_items: "{{ zuul['items'] }}"
 
-    - name: enable building images on AArch64
-      set_fact:
-        need_build_image: true
-      when:
-        - ansible_architecture == 'aarch64'
-
     # NOTE(yoctozepto): required to template template_overrides.j2 for Zuul
     - name: Include kolla Zuul vars if building new images
       include_vars:
@@ -262,7 +257,7 @@
     - name: Set facts for actions
       set_fact:
         # NOTE(yoctozepto): no support for upgrades for now
-        docker_image_tag: "{{ build_image_tag if need_build_image else zuul.branch | basename }}"
+        docker_image_tag: "{{ build_image_tag if need_build_image else (zuul.branch | basename) ~ docker_image_tag_suffix }}"
         docker_image_prefix: "{{ 'primary:4000/lokolla/' if need_build_image else 'kolla/' }}"
 
     # NOTE(mgoddard): We are using the script module here and later to ensure
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 3b0ac02391..c7b6877a10 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -47,6 +47,9 @@ openstack_tag: "{{ build_image_tag }}"
 {% else %}
 # use docker hub images
 docker_namespace: "kolla"
+{% if docker_image_tag_suffix %}
+openstack_tag_suffix: "{{ docker_image_tag_suffix }}"
+{% endif %}
 {% if need_build_image and is_previous_release %}
 # NOTE(mgoddard): Ensure that the insecure local registry is trusted, since it
 # will be the source of images during the upgrade.