aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaihlavi <l.kaihlavirt@partner.samsung.com>2019-08-27 11:30:51 +0300
committerkaihlavi <l.kaihlavirt@partner.samsung.com>2019-08-27 13:19:42 +0300
commit9f5700f414de342739ca3bed80ae882f5ec3a2f9 (patch)
treeefb34b61f2bad4c0a473acb6858171826842379e
parent2b661625874c1f933d28acbe5919cced5a2899b6 (diff)
Run prepare-csit.sh every time
Preparation steps need to be executed every time for Jenkins as they do not have all the required libraries preinstalled This is a quick fix for a problem introduced in https://gerrit.onap.org/r/#/c/integration/csit/+/93698/ A more proper correction requires refactoring and aligning prerequirements for local executions and Jenkins and needs analysis and design to be done in future releases Issue-ID: TEST-197 Signed-off-by: kaihlavi <l.kaihlavirt@partner.samsung.com> Change-Id: If15935097d2b90b9d49062429194ca7d7a0e4d3d
-rwxr-xr-xrun-csit.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/run-csit.sh b/run-csit.sh
index 043292ca..e7457adc 100755
--- a/run-csit.sh
+++ b/run-csit.sh
@@ -67,13 +67,8 @@ export TESTOPTIONS="${2}"
TESTPLANDIR=${WORKSPACE}/${TESTPLAN}
-# Assume that if env.properties is set, installation prerequirements are fulfilled
-# env.properties needs to be sourced for ROBOT_VENV
-if [ -f ${WORKSPACE}/env.properties ]; then
- source ${WORKSPACE}/env.properties
-else
- source ${WORKSPACE}/prepare-csit.sh
-fi
+# Run installation of prerequired libraries
+source ${WORKSPACE}/prepare-csit.sh
# Activate the virtualenv containing all the required libraries installed by prepare-csit.sh
source "${ROBOT_VENV}/bin/activate"