From 584da0675127d6b692a84bacfaa789b26a332ccb Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Sun, 5 Jan 2020 22:17:31 +0100
Subject: [PATCH] CI: add Centos 8 and Ubuntu jobs for aarch64

also simplify Debian job definition

Depends-on: https://review.opendev.org/718413
Depends-on: https://review.opendev.org/718363
Depends-on: https://review.opendev.org/718236
Depends-on: https://review.opendev.org/718238

Change-Id: I2c75dbc2ea063dd3507eaaf93a484c50acae5fb5
---
 .zuul.d/base.yaml                     | 12 ++++++++++++
 .zuul.d/centos.yaml                   |  9 +++++++++
 .zuul.d/debian.yaml                   |  6 +-----
 .zuul.d/ubuntu.yaml                   |  9 +++++++++
 tests/templates/template_overrides.j2 |  1 +
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index f8a7c7c12a..73c9d4a76f 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -43,12 +43,24 @@
       - name: primary
         label: debian-buster
 
+- nodeset:
+    name: kolla-centos8-aarch64
+    nodes:
+      - name: primary
+        label: centos-8-arm64
+
 - nodeset:
     name: kolla-debian-buster-aarch64
     nodes:
       - name: primary
         label: debian-buster-arm64
 
+- nodeset:
+    name: kolla-ubuntu-bionic-aarch64
+    nodes:
+      - name: primary
+        label: ubuntu-bionic-arm64
+
 - job:
     name: kolla-base
     parent: base
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
index f219b1c3d0..960f50c9f0 100644
--- a/.zuul.d/centos.yaml
+++ b/.zuul.d/centos.yaml
@@ -28,6 +28,9 @@
             files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.*
         - kolla-ansible-centos8-source-ironic:
             files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
+    check-arm64:
+      jobs:
+        - kolla-build-centos8-source-aarch64
     gate:
       queue: kolla
       jobs:
@@ -69,6 +72,12 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-build-centos8-source-aarch64
+    parent: kolla-build-centos8-source
+    nodeset: kolla-centos8-aarch64
+    voting: false
+
 - job:
     name: kolla-publish-centos8-source
     parent: kolla-build-centos8-source
diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml
index 64058d69c6..37f70618dc 100644
--- a/.zuul.d/debian.yaml
+++ b/.zuul.d/debian.yaml
@@ -29,12 +29,8 @@
 
 - job:
     name: kolla-build-debian-source-aarch64
-    parent: kolla-base
+    parent: kolla-build-debian-source
     nodeset: kolla-debian-buster-aarch64
-    voting: false
-    vars:
-      base_distro: debian
-      install_type: source
 
 - job:
     name: kolla-build-debian-binary
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
index daae673d52..4235f35433 100644
--- a/.zuul.d/ubuntu.yaml
+++ b/.zuul.d/ubuntu.yaml
@@ -16,6 +16,9 @@
             files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
         - kolla-ansible-ubuntu-source-ironic:
             files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
+    check-arm64:
+      jobs:
+        - kolla-build-ubuntu-source-aarch64
     gate:
       queue: kolla
       jobs:
@@ -57,6 +60,12 @@
       base_distro: ubuntu
       install_type: source
 
+- job:
+    name: kolla-build-ubuntu-source-aarch64
+    parent: kolla-build-ubuntu-source
+    nodeset: kolla-ubuntu-bionic-aarch64
+    voting: false
+
 - job:
     name: kolla-publish-ubuntu-source
     parent: kolla-build-ubuntu-source
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2
index d7ea2dcb95..d90524c1f5 100644
--- a/tests/templates/template_overrides.j2
+++ b/tests/templates/template_overrides.j2
@@ -95,6 +95,7 @@ RUN sed -i -e "s|http://deb.debian.org|http://{{ nodepool_mirror_host }}|" \
 
 RUN sed -i -e "s|mirror://mirrors.ubuntu.com/mirrors.txt|http://{{ nodepool_mirror_host }}/ubuntu/|" \
         -e "s|http://ubuntu-cloud.archive.canonical.com/ubuntu|http://{{ nodepool_mirror_host }}/ubuntu-cloud-archive|" \
+        -e "s|http://ports.ubuntu.com|http://{{ nodepool_mirror_host }}/ubuntu-ports|" \
         /etc/apt/sources.list
 
 {% raw %}