Merge "Switch requirements to new tagging scheme"

This commit is contained in:
Zuul 2017-10-27 05:01:23 +00:00 committed by Gerrit Code Review
commit 132338f112
3 changed files with 4 additions and 4 deletions

View File

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

View File

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

View File

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