projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Feature 11001: Robot framework linting for E2E tests"
[osm/tests.git]
/
robot-systest
/
run_test.sh
diff --git
a/robot-systest/run_test.sh
b/robot-systest/run_test.sh
index
6792452
..
1ebe21f
100755
(executable)
--- a/
robot-systest/run_test.sh
+++ b/
robot-systest/run_test.sh
@@
-44,7
+44,7
@@
create_k8scluster(){
while [ $attempts -ge 0 ] ; do
echo -e "\n$( date '+%F_%H:%M:%S' ) Creating K8s Cluster"
while [ $attempts -ge 0 ] ; do
echo -e "\n$( date '+%F_%H:%M:%S' ) Creating K8s Cluster"
- osm k8scluster-add --creds ${K8S_CREDENTIALS} --version "v1" --vim ${VIM_TARGET} --k8s-nets "{\"net1\": \"
%{VIM_MGMT_NET}\"}" ${VIM_TARGET} --description "Robot cluster"
+ osm k8scluster-add --creds ${K8S_CREDENTIALS} --version "v1" --vim ${VIM_TARGET} --k8s-nets "{\"net1\": \"
${VIM_MGMT_NET}\"}" ${VIM_TARGET} --description "Robot cluster" --skip-jujubundle
STATUS=""
i=0
STATUS=""
i=0
@@
-67,7
+67,7
@@
create_k8scluster(){
((attempts--))
done
if [ $attempts -lt 0 ] ; then
((attempts--))
done
if [ $attempts -lt 0 ] ; then
- echo "
VIM
failed to enter ENABLED state"
+ echo "
K8s cluster
failed to enter ENABLED state"
exit 1
fi
}
exit 1
fi
}
@@
-227,17
+227,10
@@
if [ "$RUN_CONFORMANCE_TESTS" = true ] ; then
python3 ${ROBOT_DEVOPS_FOLDER}/conformance-tests/run_conformance_tests.py
fi
python3 ${ROBOT_DEVOPS_FOLDER}/conformance-tests/run_conformance_tests.py
fi
-if [[ -z "${TEST}" ]]; then
- 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
+ robot -d ${ROBOT_DEVOPS_FOLDER}/reports --tagstatinclude "cluster-*" -i ${TEST} ${ROBOT_DEVOPS_FOLDER}/testsuite/
else
else
- echo "Wrong test provided"
- exit 1
+ echo "No test was provided. Exiting..."
fi
fi
-exit
1
+exit
0