diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-16 16:03:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-16 16:03:24 +0000 |
| commit | 97446186cf4e08451c44d4d84981b6d9306facd2 (patch) | |
| tree | c4778a860e90fb5e9d5434ff3a0022aae7752b2a | |
| parent | 2137cba1e0b8793dd683e58aca78d529a1d359fc (diff) | |
| parent | d6935edb43ab577b2895d701d6d7e7e555934d8b (diff) | |
| download | kolla-97446186cf4e08451c44d4d84981b6d9306facd2.tar.gz kolla-97446186cf4e08451c44d4d84981b6d9306facd2.zip | |
Merge "Add Debian/source aarch64 CI job"
| -rw-r--r-- | .zuul.d/base.yaml | 6 | ||||
| -rw-r--r-- | .zuul.d/debian.yaml | 13 | ||||
| -rw-r--r-- | tests/templates/template_overrides.j2 | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index 1cd97d282..31ddf33f7 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 5c2d93c9c..42df7237c 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 @@ -24,6 +27,16 @@ 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 nodeset: kolla-debian-buster diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index e69eab450..9156a2a83 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 |