From d6935edb43ab577b2895d701d6d7e7e555934d8b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 20 Sep 2019 17:44:06 +0200 Subject: [PATCH] Add Debian/source aarch64 CI job AArch64 is getting popular and not all changes working on x86-64 work properly on aarch64 architecture. Let check them. Job is running in separate pipeline due to low number of aarch64 nodes. Authored-By: Xinliang Liu Co-Authored-By: Jeffrey Zhang Co-Authored-By: Marcin Juszkiewicz Implements: blueprint aarch64-3rd-party-ci-kolla Depends-On: https://review.opendev.org/#/c/698606 Change-Id: I7e7802dfa4f4d9c61d01dba4b77c01cfb24301c0 --- .zuul.d/base.yaml | 6 ++++++ .zuul.d/debian.yaml | 13 +++++++++++++ tests/templates/template_overrides.j2 | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index 1cd97d282c..31ddf33f79 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -43,6 +43,12 @@ - name: primary label: debian-buster +- nodeset: + name: kolla-debian-buster-aarch64 + nodes: + - name: primary + label: debian-buster-arm64 + - job: name: kolla-base parent: base diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml index 5c2d93c9ca..42df7237c8 100644 --- a/.zuul.d/debian.yaml +++ b/.zuul.d/debian.yaml @@ -5,6 +5,9 @@ - kolla-build-debian-source - kolla-build-debian-binary - kolla-ansible-debian-source + check-arm64: + jobs: + - kolla-build-debian-source-aarch64 periodic: jobs: - kolla-publish-debian-source @@ -23,6 +26,16 @@ base_distro: debian install_type: source +- job: + name: kolla-build-debian-source-aarch64 + parent: kolla-base + nodeset: kolla-debian-buster-aarch64 + voting: false + vars: + action: build + base_distro: debian + install_type: source + - job: name: kolla-build-debian-binary parent: kolla-base diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index e69eab4507..9156a2a830 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -12,7 +12,7 @@ RUN echo registry={{ nodepool_npmjs_proxy }} > /etc/npmrc \ && ln -s /etc/npmrc /usr/etc/npmrc {% raw %} -{% if base_distro == 'ubuntu' %} +{% if base_distro in ['debian', 'ubuntu'] %} {% endraw %} # NOTE(hrw): Debian 'buster' and Ubuntu 18.04 refuse to use unsigned repos