From 2f8ac31d3f70698d36bba6125ff46a654a7f24a9 Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Tue, 6 Jun 2017 15:10:26 +0200
Subject: Install OPNFV sdnvpn via python package

Change-Id: Ibcaef4eb8658bfe7d1900a8cd6a7b48740524526
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
 docker/Dockerfile                  | 5 -----
 docker/Dockerfile.aarch64          | 5 -----
 docker/thirdparty-requirements.txt | 1 +
 3 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c13fc82e1..eb7bb6558 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,7 +17,6 @@ ARG RALLY_TAG=0.8.1
 ARG TEMPEST_TAG=15.0.0
 ARG REFSTACK_TAG=15.0.0
 ARG ODL_TAG=release/beryllium-sr4
-ARG OPENSTACK_TAG=stable/mitaka
 ARG KINGBIRD_TAG=1.1.0
 ARG VIMS_TAG=stable
 ARG VROUTER_TAG=stable
@@ -90,7 +89,6 @@ RUN ln -s /usr/local/lib/python2.7/dist-packages/functest ${FUNCTEST_REPO_DIR}/f
 
 # OPNFV repositories
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sdnvpn ${REPOS_DIR}/sdnvpn
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPOS_DIR}/domino
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/parser ${REPOS_DIR}/parser
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor
@@ -138,9 +136,6 @@ RUN curl -L https://get.rvm.io | bash -s stable
 RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh"
 RUN cd ${REPOS_DIR}/sfc && pip install -e .
 
-# SDNVPN integration
-RUN cd ${REPOS_DIR}/sdnvpn && pip install -e .
-
 # refstack-client integration
 RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \
     && bash setup_env -t ${REFSTACK_TAG} && rm setup_env
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 7014d33fc..74b27e3bd 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -17,7 +17,6 @@ ARG RALLY_TAG=0.8.1
 ARG TEMPEST_TAG=15.0.0
 ARG REFSTACK_TAG=15.0.0
 ARG ODL_TAG=release/beryllium-sr4
-ARG OPENSTACK_TAG=stable/mitaka
 ARG KINGBIRD_TAG=0.2.2
 ARG VIMS_TAG=stable
 ARG REPOS_DIR=/home/opnfv/repos
@@ -85,7 +84,6 @@ RUN pip install \
 
 # OPNFV repositories
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sdnvpn ${REPOS_DIR}/sdnvpn
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPOS_DIR}/domino
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/parser ${REPOS_DIR}/parser
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor
@@ -130,9 +128,6 @@ RUN pip install ${REPOS_DIR}/opera
 RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh"
 RUN cd ${REPOS_DIR}/sfc && pip install -e .
 
-# SDNVPN integration
-RUN cd ${REPOS_DIR}/sdnvpn && pip install -e .
-
 # refstack-client integration
 RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \
     && bash setup_env -t ${REFSTACK_TAG} && rm setup_env
diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt
index d9ad368e2..15de65442 100644
--- a/docker/thirdparty-requirements.txt
+++ b/docker/thirdparty-requirements.txt
@@ -1,4 +1,5 @@
 git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests
+git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn
 networking-bgpvpn
 kingbird
 rally
-- 
cgit 1.2.3-korg