Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Run test env towards selected kube cluster
[nonrtric.git]
/
test
/
common
/
prodstub_api_functions.sh
diff --git
a/test/common/prodstub_api_functions.sh
b/test/common/prodstub_api_functions.sh
index
f792d69
..
9af00d8
100644
(file)
--- a/
test/common/prodstub_api_functions.sh
+++ b/
test/common/prodstub_api_functions.sh
@@
-94,7
+94,7
@@
__PRODSTUB_kube_delete_all() {
# args: <log-dir> <file-prexix>
__PRODSTUB_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
# args: <log-dir> <file-prexix>
__PRODSTUB_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
- kubectl logs -l "autotest=PRODSTUB" -n $KUBE_SIM_NAMESPACE --tail=-1 > $1$2_prodstub.log 2>&1
+ kubectl
$KUBECONF
logs -l "autotest=PRODSTUB" -n $KUBE_SIM_NAMESPACE --tail=-1 > $1$2_prodstub.log 2>&1
else
docker logs $PROD_STUB_APP_NAME > $1$2_prodstub.log 2>&1
fi
else
docker logs $PROD_STUB_APP_NAME > $1$2_prodstub.log 2>&1
fi
@@
-119,6
+119,12
@@
__PRODSTUB_statisics_setup() {
fi
}
fi
}
+# Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied
+# args: -
+__PRODSTUB_test_requirements() {
+ :
+}
+
#######################################################
# Set http as the protocol to use for all communication to the Prod stub sim
#######################################################
# Set http as the protocol to use for all communication to the Prod stub sim
@@
-192,13
+198,13
@@
start_prod_stub() {
retcode_p=$?
if [ $retcode_i -ne 0 ] && [ $retcode_p -ne 0 ]; then
retcode_p=$?
if [ $retcode_i -ne 0 ] && [ $retcode_p -ne 0 ]; then
- echo -e $RED"The $
ICS
_APP_NAME app is not included as managed nor prestarted in this test script"$ERED
- echo -e $RED"The $
ICS
_APP_NAME will not be started"$ERED
+ echo -e $RED"The $
PROD_STUB
_APP_NAME app is not included as managed nor prestarted in this test script"$ERED
+ echo -e $RED"The $
PROD_STUB
_APP_NAME will not be started"$ERED
exit
fi
if [ $retcode_i -eq 0 ] && [ $retcode_p -eq 0 ]; then
exit
fi
if [ $retcode_i -eq 0 ] && [ $retcode_p -eq 0 ]; then
- echo -e $RED"The $
ICS
_APP_NAME app is included both as managed and prestarted in this test script"$ERED
- echo -e $RED"The $
ICS
_APP_NAME will not be started"$ERED
+ echo -e $RED"The $
PROD_STUB
_APP_NAME app is included both as managed and prestarted in this test script"$ERED
+ echo -e $RED"The $
PROD_STUB
_APP_NAME will not be started"$ERED
exit
fi
exit
fi