Code Review
/
dmaap
/
datarouter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[DMAAP-DR] Remove AAF/TLS phase 1
[dmaap/datarouter.git]
/
csit
/
run-csit.sh
diff --git
a/csit/run-csit.sh
b/csit/run-csit.sh
index
ce9cf80
..
2ae857d
100755
(executable)
--- a/
csit/run-csit.sh
+++ b/
csit/run-csit.sh
@@
-22,6
+22,15
@@
# functions
#
# functions
#
+# wrapper for sourcing a file
+function source_safely() {
+ [ -z "$1" ] && return 1
+ relax_set
+ # shellcheck disable=SC1090
+ . "$1"
+ load_set
+}
+
function on_exit(){
rc=$?
if [[ ${WORKSPACE} ]]; then
function on_exit(){
rc=$?
if [[ ${WORKSPACE} ]]; then
@@
-105,14
+114,6
@@
function relax_set() {
set +o pipefail
}
set +o pipefail
}
-# wrapper for sourcing a file
-function source_safely() {
- [ -z "$1" ] && return 1
- relax_set
- . "$1"
- load_set
-}
-
#
# main
#
#
# main
#
@@
-153,13
+154,14
@@
TESTPLANDIR="${WORKSPACE}/${TESTPLAN}"
source_safely "${WORKSPACE}/prepare-csit.sh"
# Activate the virtualenv containing all the required libraries installed by prepare-csit.sh
source_safely "${WORKSPACE}/prepare-csit.sh"
# Activate the virtualenv containing all the required libraries installed by prepare-csit.sh
-source_safely "${ROBOT_VENV}/bin/activate"
+source_safely "${ROBOT
3
_VENV}/bin/activate"
WORKDIR=$(mktemp -d --suffix=-robot-workdir)
WORKDIR=$(mktemp -d --suffix=-robot-workdir)
+
cd "${WORKDIR}"
# Add csit scripts to PATH
cd "${WORKDIR}"
# Add csit scripts to PATH
-export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT_VENV}/bin"
+export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT
3
_VENV}/bin"
export SCRIPTS="${WORKSPACE}/scripts"
export ROBOT_VARIABLES=
export SCRIPTS="${WORKSPACE}/scripts"
export ROBOT_VARIABLES=