Merge "Add docker image push job to release pipeline"

openstack · Mar 22, 2020 · d77be1a · d77be1a
2 parents 5ba9979 + 57a7b45
commit d77be1a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
@@ -95,7 +95,9 @@
         - rally-install-ubuntu-bionic
         - rally-install-centos-7
         - rally-install-centos-8
-        - rally-docker-build
+        - rally-docker-build:
+            vars:
+              docker_image_version: latest
     gate:
       jobs:
         - rally-tox-docs
@@ -110,4 +112,9 @@
         - rally-install-ubuntu-bionic
         - rally-install-centos-7
         - rally-install-centos-8
+        - rally-docker-build-and-push:
+            vars:
+              docker_image_version: latest
+    release:
+      jobs:
         - rally-docker-build-and-push
diff --git a/tests/ci/playbooks/roles/build_docker_image/defaults/main.yaml b/tests/ci/playbooks/roles/build_docker_image/defaults/main.yaml
@@ -1,3 +1,3 @@
 docker_repository: xrally/xrally
-docker_image_version: latest
+docker_image_version: "{{ zuul.tag }}"
 docker_image_tag: "{{ docker_repository }}:{{ docker_image_version }}"