aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-03-19 19:29:53 +0000
committerGerrit Code Review <review@openstack.org>2020-03-19 19:29:53 +0000
commit2df2273bbeac5b0ecffc8431a1a1730d4812947e (patch)
tree796cf78e51d15df4e797823ca6c5f3dee053165c
parentda65e6a6ba597701ab75480b607f83abeb1baa10 (diff)
parentc2a3380707c67f5d1202bc83855357c9d2c6a240 (diff)
downloadkolla-2df2273bbeac5b0ecffc8431a1a1730d4812947e.tar.gz
kolla-2df2273bbeac5b0ecffc8431a1a1730d4812947e.zip
Merge "CI: publish AArch64 Debian/source images"
-rw-r--r--.zuul.d/debian.yaml7
-rw-r--r--tests/templates/kolla-build.conf.j23
2 files changed, 9 insertions, 1 deletions
diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml
index 42df7237c..db3266ddb 100644
--- a/.zuul.d/debian.yaml
+++ b/.zuul.d/debian.yaml
@@ -11,9 +11,11 @@
periodic:
jobs:
- kolla-publish-debian-source
+ - kolla-publish-debian-source-aarch64
release:
jobs:
- kolla-publish-debian-source
+ - kolla-publish-debian-source-aarch64
- kolla-publish-debian-binary
- job:
@@ -63,3 +65,8 @@
publisher: true
secrets:
- kolla_dockerhub_creds
+
+- job:
+ name: kolla-publish-debian-source-aarch64
+ parent: kolla-publish-debian-source
+ nodeset: kolla-debian-buster-aarch64
diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2
index cba3c16a9..d707f5f87 100644
--- a/tests/templates/kolla-build.conf.j2
+++ b/tests/templates/kolla-build.conf.j2
@@ -2,7 +2,8 @@
debug = true
{% if publisher %}
namespace = kolla
-tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) }}
+{% set tag_suffix = '-aarch64' if ansible_architecture == 'aarch64' else '' %}
+tag = {{ (zuul.tag if zuul.pipeline == "release" else zuul.branch | basename) ~ tag_suffix }}
{% endif %}
push = false
logs_dir = {{ kolla_build_logs_dir }}