diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2018-03-20 14:46:53 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2018-03-21 16:53:15 +0800 |
| commit | abc61c012ce7ae6b282fa9280516138a4d031302 (patch) | |
| tree | 4289eff20f556cd7fb98278d4a12affc1702e3e0 | |
| parent | 0d1010ad4aae20aaf2764f0c41845d9606ca0d49 (diff) | |
| download | kolla-abc61c012ce7ae6b282fa9280516138a4d031302.tar.gz kolla-abc61c012ce7ae6b282fa9280516138a4d031302.zip | |
Support push kolla tag image to hub.docker.com site
Change-Id: I8a21f60a37ba038e46c29d0bcff9ffbd2457a257
| -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 |