diff options
| author | Zuul <zuul@review.openstack.org> | 2018-03-22 15:14:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-03-22 15:14:48 +0000 |
| commit | 216dfda8309da441b0af8c548f064c5c36a7b684 (patch) | |
| tree | c97521714f5d85ca0b3cdf3fa7edb5714e0b3afe | |
| parent | 77e6633a9ba7c06ea196bb54e3c5acadbfe32692 (diff) | |
| parent | abc61c012ce7ae6b282fa9280516138a4d031302 (diff) | |
| download | kolla-216dfda8309da441b0af8c548f064c5c36a7b684.tar.gz kolla-216dfda8309da441b0af8c548f064c5c36a7b684.zip | |
Merge "Support push kolla tag image to hub.docker.com site"
| -rw-r--r-- | .zuul.d/centos.yaml | 4 | ||||
| -rw-r--r-- | .zuul.d/oraclelinux.yaml | 4 | ||||
| -rw-r--r-- | .zuul.d/ubuntu.yaml | 4 | ||||
| -rw-r--r-- | tests/templates/kolla-build.conf.j2 | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 0f543ed95..3c1746954 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 e94366100..c1c455ad6 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 af8966d08..393751da0 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 39e95ecce..994c58371 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 |