aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-06-27 13:34:01 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-27 13:34:01 +0000
commit7c5786afbd8b63c7ca71961abc52a2477ea03824 (patch)
tree465ed6ed92d8ef4581f71661d60e1d9cd692709a
parent42469fc34e2e216a1a655dae364d06f0f634d0e7 (diff)
parentae95e8627bd83cbd92f22c80fd287b6f529f9a17 (diff)
Merge "Add sfc in thirdparty-requirements.txt"
-rw-r--r--docker/Dockerfile4
-rw-r--r--docker/Dockerfile.aarch644
-rw-r--r--docker/thirdparty-requirements.txt1
-rw-r--r--functest/ci/config_functest.yaml1
4 files changed, 3 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e2ae5526..a3ebc1a1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -95,7 +95,6 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPO
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REPOS_DIR}/promise
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/netready ${REPOS_DIR}/netready
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds ${REPOS_DIR}/fds
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_DIR}/sfc
# other repositories
RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git ${REPOS_DIR}/odl_test
@@ -129,8 +128,7 @@ RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C
RUN curl -L https://get.rvm.io | bash -s stable
# SFC integration
-RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh"
-RUN cd ${REPOS_DIR}/sfc && pip install ${PIP_OPTS} -e .
+RUN /bin/bash -c ". /usr/local/lib/python2.7/dist-packages/sfc/tests/functest/setup_scripts/tacker_client_install.sh"
# refstack-client integration
RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index a0ae33c4..1a7dc027 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -88,7 +88,6 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPO
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
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REPOS_DIR}/promise
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_DIR}/sfc
# other repositories
RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git ${REPOS_DIR}/odl_test
@@ -121,8 +120,7 @@ RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C
RUN curl -L https://get.rvm.io | bash -s stable
# SFC integration
-RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh"
-RUN cd ${REPOS_DIR}/sfc && pip install ${PIP_OPTS} -e .
+RUN /bin/bash -c ". /usr/local/lib/python2.7/dist-packages/sfc/tests/functest/setup_scripts/tacker_client_install.sh"
# refstack-client integration
RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \
diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt
index fd262d7c..f51a5e29 100644
--- a/docker/thirdparty-requirements.txt
+++ b/docker/thirdparty-requirements.txt
@@ -2,6 +2,7 @@ git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests
git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn
git+https://gerrit.opnfv.org/gerrit/opera#egg=opera
git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning
+git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc
networking-bgpvpn
rally
tempest>=15.0.0 # Apache-2.0
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index f703d217..1199be5a 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -6,7 +6,6 @@ general:
repo_tempest: /home/opnfv/.tempest
dir_repo_releng: /home/opnfv/repos/releng
repo_vims_test: /home/opnfv/repos/vnfs/vims-test
- repo_sfc: /home/opnfv/repos/sfc
repo_onos: /home/opnfv/repos/onos
repo_netready: /home/opnfv/repos/netready
repo_barometer: /home/opnfv/repos/barometer