From abc61c012ce7ae6b282fa9280516138a4d031302 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Tue, 20 Mar 2018 14:46:53 +0800 Subject: [PATCH] Support push kolla tag image to hub.docker.com site Change-Id: I8a21f60a37ba038e46c29d0bcff9ffbd2457a257 --- .zuul.d/centos.yaml | 4 ++++ .zuul.d/oraclelinux.yaml | 4 ++++ .zuul.d/ubuntu.yaml | 4 ++++ tests/templates/kolla-build.conf.j2 | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 0f543ed95e..3c1746954a 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -19,6 +19,10 @@ jobs: - kolla-publish-centos-source - kolla-publish-centos-binary + release: + jobs: + - kolla-publish-centos-source + - kolla-publish-centos-binary - job: name: kolla-build-centos-binary diff --git a/.zuul.d/oraclelinux.yaml b/.zuul.d/oraclelinux.yaml index e943661005..c1c455ad67 100644 --- a/.zuul.d/oraclelinux.yaml +++ b/.zuul.d/oraclelinux.yaml @@ -19,6 +19,10 @@ jobs: - kolla-publish-oraclelinux-source - kolla-publish-oraclelinux-binary + release: + jobs: + - kolla-publish-oraclelinux-source + - kolla-publish-oraclelinux-binary - job: name: kolla-build-oraclelinux-binary diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index af8966d083..393751da03 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -19,6 +19,10 @@ jobs: - kolla-publish-ubuntu-source - kolla-publish-ubuntu-binary + release: + jobs: + - kolla-publish-ubuntu-source + - kolla-publish-ubuntu-binary - job: name: kolla-build-ubuntu-binary diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2 index 39e95eccee..994c58371a 100644 --- a/tests/templates/kolla-build.conf.j2 +++ b/tests/templates/kolla-build.conf.j2 @@ -2,7 +2,7 @@ debug = true {% if publisher %} namespace = kolla -tag = {{ zuul.branch | basename }} +tag = {{ zuul.tag if zuul.pipeline == "release" else zuul.branch | basename }} {% endif %} push = false logs_dir = /tmp/logs/build