Get the branch name for tagging

Change-Id: I4a8b1c92688fddbdcb30b73a1b682c3e9941c041

playbooks/loci-builder.yaml

@@ -54,7 +54,7 @@
         - docker_image:
             path: "{{ zuul.project.src_dir }}"
             name: openstackloci/{{ project }}
-            tag: master-{{ item.name }}
+            tag: "{{ branch }}-{{ item.name }}"
             pull: False
             buildargs: "{{ item.buildargs.project }}"
           with_items: "{{ distros }}"

playbooks/push.yaml

@@ -6,5 +6,5 @@
       block:
         - command: docker login -u {{ loci_docker_login.user }} -p {{ loci_docker_login.password }}
           no_log: True
-        - command: docker push openstackloci/{{ project }}:master-{{ item.name }}
+        - command: docker push openstackloci/{{ project }}:{{ branch }}-{{ item.name }}
           with_items: "{{ distros }}"

playbooks/vars.yaml

@@ -7,6 +7,8 @@ docker_daemon:
   insecure-registries:
     - 172.17.0.1:5000
 
+branch: "{{ zuul_execution_branch.split('/')[-1] }}"
+
 distros:
   - name: centos
     image: centos:7