Code Review
/
testsuite.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[POSTINSTALL] Deprecate dmaap part of postinstall
[testsuite.git]
/
runTags.sh
diff --git
a/runTags.sh
b/runTags.sh
old mode 100644
(file)
new mode 100755
(executable)
index
e8a00b7
..
5381c87
--- a/
runTags.sh
+++ b/
runTags.sh
@@
-5,7
+5,7
@@
DEFAULT_LOG_LEVEL="TRACE" # Available levels: TRACE, DEBUG, INFO (default), WARN
DEFAULT_RES="1280x1024x24"
DEFAULT_DISPLAY=":99"
DEFAULT_ROBOT_TEST="-i health"
DEFAULT_RES="1280x1024x24"
DEFAULT_DISPLAY=":99"
DEFAULT_ROBOT_TEST="-i health"
-INSTALL_NAME="O
penECOMP_ETE
"
+INSTALL_NAME="O
NAP
"
DEFAULT_OUTPUT_FOLDER=./
# To mitigate the chromedriver hanging issue
DEFAULT_OUTPUT_FOLDER=./
# To mitigate the chromedriver hanging issue
@@
-21,6
+21,7
@@
OUTPUT_FOLDER=${OUTPUT_FOLDER:-$DEFAULT_OUTPUT_FOLDER}
VARIABLEFILES=
LISTENERS=
VARIABLEFILES=
LISTENERS=
+VARIABLES="--removekeywords name:keystone_interface.*"
## Single argument, it is an include tag
if [ $# -eq 1 ]; then
## Single argument, it is an include tag
if [ $# -eq 1 ]; then
@@
-82,10
+83,11
@@
export DISPLAY=${DISPLAY}
# Execute tests
echo -e "Executing robot tests at log level ${LOG_LEVEL}"
# Execute tests
echo -e "Executing robot tests at log level ${LOG_LEVEL}"
-ROBOT_LIBS=./robot/library:./robot/library/
et
eutils:./robot/library/heatbridge
+ROBOT_LIBS=./robot/library:./robot/library/
ONAPLibrary:./robot/library/vcp
eutils:./robot/library/heatbridge
cd /var/opt/${INSTALL_NAME}
cd /var/opt/${INSTALL_NAME}
-python -m robot.run -L ${LOG_LEVEL} -d ${OUTPUT_FOLDER} ${VARIABLEFILES} ${VARIABLES} ${LISTENERS} -P ${ROBOT_LIBS} ${ROBOT_TAGS} $(pwd)
+python -m robot.run -L ${LOG_LEVEL} -d ${OUTPUT_FOLDER} ${VARIABLEFILES} ${VARIABLES} ${LISTENERS} -P ${ROBOT_LIBS} ${ROBOT_TAGS} /var/opt/${INSTALL_NAME}/robot/testsuites/
+RET_CODE=$?
# Stop Xvfb we started earlier
# select it from list of possible Xvfb pids running because
# Stop Xvfb we started earlier
# select it from list of possible Xvfb pids running because
@@
-98,3
+100,5
@@
do
kill -9 $P
fi
done
kill -9 $P
fi
done
+
+exit $RET_CODE