diff --git a/Dockerfile b/Dockerfile index 09d7459..9fa56a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ${FROM} ENV PATH=/var/lib/openstack/bin:$PATH ARG PROJECT -ARG WHEELS=openstackloci/requirements:ubuntu +ARG WHEELS=openstackloci/requirements:master-ubuntu ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT} ARG PROJECT_REF=master ARG DISTRO diff --git a/playbooks/loci-builder.yaml b/playbooks/loci-builder.yaml index 1a43bb0..e59e313 100644 --- a/playbooks/loci-builder.yaml +++ b/playbooks/loci-builder.yaml @@ -10,7 +10,7 @@ block: - docker_image: name: openstackloci/requirements - tag: "{{ item.name }}" + tag: "{{ branch}}-{{ item.name }}" repository: 172.17.0.1:5000/openstackloci/requirements push: yes with_items: "{{ distros }}" diff --git a/playbooks/vars.yaml b/playbooks/vars.yaml index fd8b25a..d1c47f0 100644 --- a/playbooks/vars.yaml +++ b/playbooks/vars.yaml @@ -24,7 +24,7 @@ distros: project: PROJECT: "{{ project }}" PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} - WHEELS: 172.17.0.1:5000/openstackloci/requirements:centos + WHEELS: 172.17.0.1:5000/openstackloci/requirements:{{ branch }}-centos FROM: base:centos - name: ubuntu image: ubuntu:xenial @@ -39,5 +39,5 @@ distros: project: PROJECT: "{{ project }}" PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} - WHEELS: 172.17.0.1:5000/openstackloci/requirements:ubuntu + WHEELS: 172.17.0.1:5000/openstackloci/requirements:{{ branch }}-ubuntu FROM: base:ubuntu