From 9846a27a6b453d4591979653d7ac0d52f7930fc7 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Wed, 15 Nov 2017 13:18:55 +0800
Subject: Improve gate post jobs

- Reuse build jobs to publish images
- Add binary jobs in periodic pipeline
- Push all image to dockerhub
- Use branch name for image tag

Change-Id: Ifefb96bcbcc9c6840cf865f7786b43a43fae4c17
---
 tests/playbooks/publish.yml         | 4 ++++
 tests/templates/kolla-build.conf.j2 | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/playbooks/publish.yml b/tests/playbooks/publish.yml
index 9a019fac9..a72dffc79 100644
--- a/tests/playbooks/publish.yml
+++ b/tests/playbooks/publish.yml
@@ -4,5 +4,9 @@
     - name: Login to Dockerhub
       command: "docker login -u {{ kolla_dockerhub_creds.user }} -p {{ kolla_dockerhub_creds.password }}"
       no_log: true
+      when:
+        - publisher
 
     - shell: "for img in $(docker images  --format '{% raw %}{{ .Repository }}:{{ .Tag }}{% endraw %}' | grep kolla ); do docker push $img; done"
+      when:
+        - publisher
diff --git a/tests/templates/kolla-build.conf.j2 b/tests/templates/kolla-build.conf.j2
index 3b1ea1051..13e857178 100644
--- a/tests/templates/kolla-build.conf.j2
+++ b/tests/templates/kolla-build.conf.j2
@@ -1,11 +1,8 @@
 [DEFAULT]
 debug = true
 {% if publisher %}
-profile = default
-profile = infra
-profile = main
 namespace = kolla
-tag = queens
+tag = {{ zuul.branch | basename }}
 {% endif %}
 push = false
 logs_dir = /tmp/logs/build
-- 
cgit v1.2.3