Merge "Switch path for loci dockerfiles"

playbooks/loci-builder.yaml

@@ -31,7 +31,7 @@
     - name: Build base images
       block:
         - docker_image:
-            path: "{{ zuul.project.src_dir }}/dockerfiles/{{ item.name }}"
+            path: "{{ loci_src_dir }}/dockerfiles/{{ item.name }}"
             name: base
             tag: "{{ item.name }}"
             buildargs: "{{ item.buildargs.base }}"
@@ -52,7 +52,7 @@
     - name: Build project images
       block:
         - docker_image:
-            path: "{{ zuul.project.src_dir }}"
+            path: "{{ loci_src_dir }}"
             name: openstackloci/{{ project }}
             tag: "{{ branch }}-{{ item.name }}"
             pull: False

playbooks/vars.yaml

@@ -7,6 +7,10 @@ docker_daemon:
   insecure-registries:
     - 172.17.0.1:5000
 
+# NOTE(SamYaple): When running in the loci repo, the project is "loci", but
+# when running as a post job for cinder, the project is "cinder". We statically
+# declare the path rather than using zuul variables so thats not an issue
+loci_src_dir: "src/git.openstack.org/openstack/loci"
 branch: "{{ zuul_execution_branch.split('/')[-1] }}"
 
 distros: