From 739a151179af2fd69c8bca107f917811a4a3f6b4 Mon Sep 17 00:00:00 2001
From: Jose Lausuch <jose.lausuch@ericsson.com>
Date: Tue, 13 Jun 2017 11:26:52 +0800
Subject: Change barometer module to load
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
As [1] is merged, the way to call the barometer test case is
different as it is hosted in Barometer repo instead of Functest.
The former files are also simply removed too.
baro-tests is no longer a requirement. It is installed as any
third party project.
[1] https://gerrit.opnfv.org/gerrit/#/c/35927/
Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: Iea56b48fa781600eb3a6ac74662ea8a29f556f99
Signed-off-by: Jose Lausuch <jose.lausuch@ericsson.com>
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
docker/Dockerfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'docker/Dockerfile')
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d18c6c97d..80864ed9c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -79,11 +79,12 @@ RUN mkdir -p ${FUNCTEST_REPO_DIR} \
RUN git config --global http.sslVerify false
+COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN pip install \
git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \
- git+https://gerrit.opnfv.org/gerrit/barometer@$BRANCH#egg=baro_tests \
- git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps
+ git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \
+ -r thirdparty-requirements.txt
# Hook required by hardcoded paths in Functest
RUN ln -s /usr/local/lib/python2.7/dist-packages/functest ${FUNCTEST_REPO_DIR}/functest
--
cgit