From 04f7b6126c13f5211b2939f88599316b18ce5f55 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Tue, 20 Mar 2018 14:46:53 +0800
Subject: [PATCH] Support push kolla tag image to hub.docker.com site

Change-Id: I8a21f60a37ba038e46c29d0bcff9ffbd2457a257
(cherry picked from commit abc61c012ce7ae6b282fa9280516138a4d031302)
---
 .zuul.yaml                          | 8 ++++++++
 tests/templates/kolla-build.conf.j2 | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 498eb1ab2d..14e975756e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -45,6 +45,14 @@
         - kolla-publish-ubuntu-binary
         - kolla-publish-oraclelinux-source
         - kolla-publish-oraclelinux-binary
+    release:
+      jobs:
+        - kolla-publish-centos-source
+        - kolla-publish-centos-binary
+        - kolla-publish-ubuntu-source
+        - kolla-publish-ubuntu-binary
+        - kolla-publish-oraclelinux-source
+        - kolla-publish-oraclelinux-binary
 
 - secret:
     name: kolla_dockerhub_creds_pike
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