Switch path for loci dockerfiles

The variable we are using is only correct when running under the loci
repo. When run under the cinder repo, it points to the cinder directory.
There is no other variable to reconsume that profides this info

Change-Id: I65229233caedee8cc948630e8d868e12ebef8514
This commit is contained in:
Sam Yaple 2017-10-17 11:14:54 -04:00
parent 924091590c
commit 434c6413bf
2 changed files with 6 additions and 2 deletions

View File

@ -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

View File

@ -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: