projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moving robot-systests deprecated to tests
[osm/tests.git]
/
robot-systest
/
run_test.sh
diff --git
a/robot-systest/run_test.sh
b/robot-systest/run_test.sh
index
ac2e330
..
edf32b7
100755
(executable)
--- a/
robot-systest/run_test.sh
+++ b/
robot-systest/run_test.sh
@@
-52,7
+52,7
@@
while (( "$#" )); do
shift 2
;;
-o|--osmclientversion)
shift 2
;;
-o|--osmclientversion)
- OSMCLIENT=$2 install_osmclient
+ OSMCLIENT=$2
&&
install_osmclient
shift 2
;;
-c|--createvim)
shift 2
;;
-c|--createvim)
@@
-70,7
+70,7
@@
Usage:
-o <osmclient_version> \\
-p <package_branch> \\
-t <testing_tags>
-o <osmclient_version> \\
-p <package_branch> \\
-t <testing_tags>
-
+
Options:
--env-file: It is the environmental file where is described the OSM target and VIM
-o <osmclient_version> [OPTIONAL]: It is used to specify a particular osmclient version. Default: latest
Options:
--env-file: It is the environmental file where is described the OSM target and VIM
-o <osmclient_version> [OPTIONAL]: It is used to specify a particular osmclient version. Default: latest
@@
-98,13
+98,17
@@
done
eval set -- "$PARAMS"
eval set -- "$PARAMS"
-if [[ -z $TEST ]]; then
+if [[ -n "$BRANCH_NAME" ]]; then
+ PACKAGES=$BRANCH_NAME && download_packages
+ OSMCLIENT=$BRANCH_NAME && install_osmclient
+fi
+
+if [[ -z "${TEST}" ]]; then
printf "Test not provided. \nRunning default test: sanity\n"
TEST="sanity"
fi
printf "Test not provided. \nRunning default test: sanity\n"
TEST="sanity"
fi
-
-if [[ -n "$TEST" ]]; then
+if [[ -n "${TEST}" ]]; then
robot -d ${ROBOT_DEVOPS_FOLDER}/reports -i ${TEST} ${ROBOT_DEVOPS_FOLDER}/testsuite/
exit 0
else
robot -d ${ROBOT_DEVOPS_FOLDER}/reports -i ${TEST} ${ROBOT_DEVOPS_FOLDER}/testsuite/
exit 0
else