From 8bf944f3c3b2160b2d2d47647fb6c97f9e133a88 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 20 May 2017 11:57:35 +0200
Subject: Add baro_tests as requirements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It also stops cloning it when building the docker container and updates
the related unit tests.

It bypasses the bug when importing collectd [1].

[1] https://jira.opnfv.org/browse/BAROMETER-79

Change-Id: Ie9f8ea2b3c95d6b1f5405d76b018cdcb62343a58
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 docker/Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4a570b5d..ef5967f7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -89,7 +89,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/barometer ${REPOS_DIR}/barometer
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_DIR}/sfc
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/snaps ${REPOS_DIR}/snaps
 RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS_DIR}/securityscanning
@@ -115,9 +114,6 @@ RUN cd ${FUNCTEST_REPO_DIR} \
     && pip install -r requirements.txt \
     && pip install -e .
 
-RUN cd ${REPOS_DIR}/barometer \
-    && pip install .
-
 RUN pip install ${REPOS_DIR}/opera
 
 RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \
-- 
cgit