From: Tim Rozet <trozet@redhat.com>
Date: Wed, 22 Aug 2018 21:55:41 +0000 (-0400)
Subject: CPERF: Fix csit odltools install
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=38ca028551d2e498fdfe41627f8bf79a43a6a0fa

CPERF: Fix csit odltools install

PIP installing odltools attempts to install/update chardet which was
already managed by yum in the container so need to remove it.

Change-Id: Id07b76b080ff5b7e77d4c110c90a15018397d039
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index 4fdcd102b..15f8669a6 100755
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -167,6 +167,7 @@ docker run -i --net=host \
   opnfv/cperf:$DOCKER_TAG \
   /bin/bash -c "source /tmp/overcloudrc; mkdir -p \$HOME/.ssh; cp /tmp/id_rsa \$HOME/.ssh; \
   cd /home/opnfv/repos/odl_test/ && git pull origin master; \
+  yum remove -y python-chardet; \
   pip install odltools; \
   ${robot_cmd} ${suites};"