summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-06-27 14:04:43 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-06-27 14:07:11 +0200
commitae95e8627bd83cbd92f22c80fd287b6f529f9a17 (patch)
tree021725fa706512ae8d2a2c7f284cfe9d325d511b
parentebfabc749ecd3c5298d1d577e64d5632968d916f (diff)
Add sfc in thirdparty-requirements.txt
Now it can be installed via python package [1] and then be listed in thirdparty-requirements.txt. [1] https://gerrit.opnfv.org/gerrit/#/c/36445/ Change-Id: Iae7482865917e51a96a180b0a987ab0ff26a0190 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-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 7c72e1683..a9eebeb7d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -96,7 +96,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
@@ -130,8 +129,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 d444ea627..f9d98b233 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -89,7 +89,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
@@ -122,8 +121,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 ad089fabd..4fe981470 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>=12.1.0 # Apache-2.0
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index d5b34ade0..ed3f24752 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -6,7 +6,6 @@ general:
repo_tempest: /home/opnfv/repos/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