From: Venkatrangan Govindarajan <vgovindarajan@luminanetworks.com>
Date: Fri, 19 Jun 2020 16:13:26 +0000 (+0530)
Subject: Fix the robotframework install fo CSIT jobs
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F90521%2F4;p=releng%2Fbuilder.git

Fix the robotframework install fo CSIT jobs

JIRA: INTTEST-103
Signed-off-by: Venkatrangan Govindarajan <vgovindarajan@luminanetworks.com>
Change-Id: Ie6ac9c0a987673a67a6c6adfd01bbef1ca3ab97f
---

diff --git a/jjb/integration/integration-install-robotframework.sh b/jjb/integration/integration-install-robotframework.sh
index de6fb254aa..ca169d7467 100644
--- a/jjb/integration/integration-install-robotframework.sh
+++ b/jjb/integration/integration-install-robotframework.sh
@@ -15,7 +15,7 @@ echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
 # The --system-site-packages parameter allows us to pick up system level
 # installed packages. This allows us to bake matplotlib which takes very long
 # to install into the image.
-virtualenv --system-site-packages "${ROBOT_VENV}"
+virtualenv -p python3 --system-site-packages "${ROBOT_VENV}"
 # shellcheck disable=SC1090
 source "${ROBOT_VENV}/bin/activate"
 
@@ -30,14 +30,13 @@ pip install --upgrade robotframework-httplibrary \
     requests==2.15.1 \
     robotframework-requests \
     robotframework-sshlibrary==3.1.1 \
-    robotframework-selenium2library \
-    robotframework-pycurllibrary
+    robotframework-selenium2library
 
 # Module jsonpath is needed by current AAA idmlite suite.
 pip install --upgrade jsonpath-rw
 
 # Modules for longevity framework robot library
-pip install --upgrade elasticsearch==1.7.0 elasticsearch-dsl==0.0.11
+pip install --upgrade elasticsearch elasticsearch-dsl
 
 # Module for pyangbind used by lispflowmapping project
 pip install --upgrade pyangbind
@@ -51,13 +50,6 @@ pip install --upgrade jmespath
 # Module for backup-restore support library
 pip install --upgrade jsonpatch
 
-#Module for elasticsearch python client
-#Module for elasticsearch python client
-python3 -m pip install --user urllib3==1.22
-python3 -m pip install --user requests==2.9.1
-python3 -m pip install --user elasticsearch==6.2.0
-python3 -m pip install --user PyYAML==3.11
-
 # odltools for extra debugging
 pip install odltools
 odltools -V