Changing sdc directory to unzipped_sdc_csar

[integration/csit.git] / run-csit.sh

diff --git a/run-csit.sh b/run-csit.sh
index 40cd9ee..e7457ad 100755 (executable)
--- a/run-csit.sh
+++ b/run-csit.sh
@@ -1,6 +1,7 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # Copyright 2016-2017 Huawei Technologies Co., Ltd.
+# Modification Copyright 2019 © Samsung Electronics Co., Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,8 +17,6 @@
 #
 # $1 project/functionality
 # $2 robot options
-# $3 ci-management repo location
-
 
 function docker_stats(){
     #General memory details
@@ -41,91 +40,48 @@ function docker_stats(){
 
 if [ $# -eq 0 ]
 then
-    echo 
-    echo "Usage: $0 plans/<project>/<functionality> [<robot-options>] [<ci-management-dir>]"
+    echo
+    echo "Usage: $0 plans/<project>/<functionality> [<robot-options>]"
     echo
     echo "    <project>, <functionality>, <robot-options>:  "
     echo "        The same values as for the '{project}-csit-{functionality}' JJB job template."
     echo
-    echo "    <ci-management-dir>: "
-    echo "        Path to the ci-management repo checked out locally.  It not specified, "
-    echo "        assumed to be adjacent to the integration repo directory."
-    echo
     exit 1
 fi
 
 if [ -z "$WORKSPACE" ]; then
     export WORKSPACE=`git rev-parse --show-toplevel`
 fi
+
 rm -rf $WORKSPACE/archives
 mkdir -p $WORKSPACE/archives
 
-if [ -f ${WORKSPACE}/test/csit/${1}/testplan.txt ]; then
+if [ -f ${WORKSPACE}/${1}/testplan.txt ]; then
     export TESTPLAN="${1}"
 else
-    echo "testplan not found: ${WORKSPACE}/test/csit/${TESTPLAN}/testplan.txt"
+    echo "testplan not found: ${WORKSPACE}/${TESTPLAN}/testplan.txt"
     exit 2
 fi
 
-
 export TESTOPTIONS="${2}"
 
-if [ -z "$3" ]; then
-    CI=${WORKSPACE}/../ci-management
-else
-    CI=${3}
-fi
-
-
+TESTPLANDIR=${WORKSPACE}/${TESTPLAN}
 
+# Run installation of prerequired libraries
+source ${WORKSPACE}/prepare-csit.sh
 
-TESTPLANDIR=${WORKSPACE}/test/csit/${TESTPLAN}
-
-# Assume that if ROBOT_VENV is set, we don't need to reinstall robot
-if [ -f ${WORKSPACE}/env.properties ]; then
-    source ${WORKSPACE}/env.properties
-    source ${ROBOT_VENV}/bin/activate
-fi
-if ! type pybot > /dev/null; then
-    rm -f ${WORKSPACE}/env.properties
-    source $CI/jjb/integration/include-raw-integration-install-robotframework.sh
-    source ${WORKSPACE}/env.properties
-    source ${ROBOT_VENV}/bin/activate
-fi
-
-# install required Robot libraries
-pip install robotframework-selenium2library==1.8.0 robotframework-extendedselenium2library==0.9.1
-
-# install eteutils
-mkdir -p ${ROBOT_VENV}/src/onap
-rm -rf ${ROBOT_VENV}/src/onap/testsuite
-git clone https://gerrit.onap.org/r/testsuite/python-testing-utils.git ${ROBOT_VENV}/src/onap/testsuite/python-testing-utils
-pip install --upgrade ${ROBOT_VENV}/src/onap/testsuite/python-testing-utils
-
-pip freeze
-
-# install chrome driver
-google-chrome --version
-if [ ! -x ${ROBOT_VENV}/bin/chromedriver ]; then
-    pushd ${ROBOT_VENV}/bin
-    wget -N http://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip
-    unzip chromedriver_linux64.zip
-    chmod +x chromedriver
-    popd
-fi
-
+# Activate the virtualenv containing all the required libraries installed by prepare-csit.sh
+source "${ROBOT_VENV}/bin/activate"
 
 WORKDIR=`mktemp -d --suffix=-robot-workdir`
 cd ${WORKDIR}
 
-
 set +u
 set -x
 
-
 # Add csit scripts to PATH
-export PATH=${PATH}:${WORKSPACE}/test/csit/docker/scripts:${WORKSPACE}/test/csit/scripts:${ROBOT_VENV}/bin
-export SCRIPTS=${WORKSPACE}/test/csit/scripts
+export PATH=${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT_VENV}/bin
+export SCRIPTS=${WORKSPACE}/scripts
 export ROBOT_VARIABLES=
 
 # Sign in to nexus3 docker repo
@@ -145,7 +101,7 @@ docker_stats | tee $WORKSPACE/archives/_sysinfo-1-after-setup.txt
 # Run test plan
 cd $WORKDIR
 echo "Reading the testplan:"
-cat ${TESTPLANDIR}/testplan.txt | egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' | sed "s|^|${WORKSPACE}/test/csit/tests/|" > testplan.txt
+cat ${TESTPLANDIR}/testplan.txt | egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' | sed "s|^|${WORKSPACE}/tests/|" > testplan.txt
 cat testplan.txt
 SUITES=$( xargs -a testplan.txt )