aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-09-13 21:10:02 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-09-13 21:45:01 +0200
commit7b13ec0cadef004f9f14ab2eabeafc62ab28e1af (patch)
tree82ed863e1fe2a2b858cd7053cd993ea4def87525 /docker
parent6eda3b833fd6c75860f3ac807071689ddcdf46a5 (diff)
Switch to networking-* master
Change-Id: Iee875b514c27e6f8b95517cf6cf2c4325fb3acba Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/features/Dockerfile2
-rw-r--r--docker/smoke/Dockerfile4
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 3f6356c39..01e0cb2bb 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -10,7 +10,7 @@ RUN apk --no-cache add --update python3 sshpass && \
python-dev python3-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev && \
wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
- sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \
+ sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ \
> upper-constraints.txt && \
wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 3aafdbbcb..b133db77b 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -4,14 +4,14 @@ ARG BRANCH=master
ARG OPENSTACK_TAG=master
ARG REFSTACK_TARGET=2018.02
ARG PATROLE_TAG=0.3.0
-ARG NEUTRON_TAG=0.2.0
+ARG NEUTRON_TAG=master
ARG BARBICAN_TAG=0.1.0
RUN apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev && \
wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
- sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \
+ sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ \
> upper-constraints.txt && \
wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \