openstack/loci
Code Issues Proposed changes

Merge "Switch requirements to new tagging scheme"

Browse Source
This commit is contained in:
Zuul
2017-10-27 05:01:23 +00:00
committed by Gerrit Code Review
parent 31b53e0e93 3546f8f6a2
commit 132338f112
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -3,7 +3,7 @@ FROM ${FROM}
ENV PATH=/var/lib/openstack/bin:$PATH ENV PATH=/var/lib/openstack/bin:$PATH
ARG PROJECT ARG PROJECT
ARG WHEELS=openstackloci/requirements:ubuntu ARG WHEELS=openstackloci/requirements:master-ubuntu
ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT} ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT}
ARG PROJECT_REF=master ARG PROJECT_REF=master
ARG DISTRO ARG DISTRO

2
playbooks/loci-builder.yaml
View File

@@ -10,7 +10,7 @@
block: block:
- docker_image: - docker_image:
name: openstackloci/requirements name: openstackloci/requirements
tag: "{{ item.name }}" tag: "{{ branch}}-{{ item.name }}"
repository: 172.17.0.1:5000/openstackloci/requirements repository: 172.17.0.1:5000/openstackloci/requirements
push: yes push: yes
with_items: "{{ distros }}" with_items: "{{ distros }}"

4
playbooks/vars.yaml
View File

@@ -24,7 +24,7 @@ distros:
project: project:
PROJECT: "{{ project }}" PROJECT: "{{ project }}"
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ 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 FROM: base:centos
- name: ubuntu - name: ubuntu
image: ubuntu:xenial image: ubuntu:xenial
@@ -39,5 +39,5 @@ distros:
project: project:
PROJECT: "{{ project }}" PROJECT: "{{ project }}"
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ 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 FROM: base:ubuntu