Switch to networking-* master

Change-Id: Iee875b514c27e6f8b95517cf6cf2c4325fb3acba
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 3f6356c..01e0cb2 100644 (file)
--- 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 3aafdbb..b133db7 100644 (file)
--- 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 && \

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 8ac4fd0..5957145 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -17,5 +17,5 @@ robotframework-requests===0.4.7
 robotframework-sshlibrary===2.1.3;python_version=='2.7'
 ansible===2.3.2.0
 xtesting===0.60.0
-networking-bgpvpn===8.0.0
-networking-sfc===6.0.0
+git+https://git.openstack.org/openstack/networking-bgpvpn#egg=networking_bgpvpn
+git+https://git.openstack.org/openstack/networking-sfc#egg=networking_sfc