Synching loci-ironic to match upstream projects

2017-06-22 09:23:22 -07:00 · 2017-06-22 09:23:22 -07:00 · 3e13040c94
parent ae778efcac
commit 3e13040c94
7 changed files with 9 additions and 0 deletions
--- a/centos/Dockerfile
+++ b/centos/Dockerfile
@ -1,5 +1,6 @@
 FROM centos:7

+ENV PATH=/var/lib/openstack/bin:$PATH
 ENV PROJECT=ironic
 ARG WHEELS=openstackloci/requirements:centos
 ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT}
--- a/centos/override/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
+++ b/centos/override/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
--- a/centos/testvars
+++ b/centos/testvars
@ -0,0 +1,2 @@
+export PROJECT=ironic
+export DISTRO=centos
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@ -1,5 +1,6 @@
 FROM debian:jessie-slim

+ENV PATH=/var/lib/openstack/bin:$PATH
 ENV PROJECT=ironic
 ARG WHEELS=openstackloci/requirements:debian
 ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT}
--- a/debian/testvars
+++ b/debian/testvars
@ -0,0 +1,2 @@
+export PROJECT=nova
+export DISTRO=debian
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@ -1,5 +1,6 @@
 FROM ubuntu:xenial

+ENV PATH=/var/lib/openstack/bin:$PATH
 ENV PROJECT=ironic
 ARG WHEELS=openstackloci/requirements:ubuntu
 ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT}
--- a/ubuntu/testvars
+++ b/ubuntu/testvars
@ -0,0 +1,2 @@
+export PROJECT=ironic
+export DISTRO=ubuntu