summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-01-28 10:47:55 +0000
committervarac <varacanero@zeromail.org>2015-01-28 10:47:55 +0000
commit1a58d05e32a382f433b0079fe9ecc88e733a2415 (patch)
treeb029e8bbff740f26a5750875585e0ebe7706c6c1
parent642db27a61f859295c07a2db0860e60caa8d1b94 (diff)
added timestamps, really fail when there are other running procs
-rwxr-xr-xleap-platform-test8
1 files changed, 4 insertions, 4 deletions
diff --git a/leap-platform-test b/leap-platform-test
index 4a7e30e..3e9c015 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -54,7 +54,7 @@ add_nodes() {
bootstrap_nodes() {
- check_for_running_instances
+ check_for_running_instances || exit $?
for vm in $@
do
@@ -85,7 +85,7 @@ check_for_running_instances() {
create_provider() {
- check_for_running_instances
+ check_for_running_instances || exit $?
if [ -e "$PROVIDERDIR" ]
then
@@ -140,7 +140,7 @@ deploy() {
ERRLOG2="$LOGDIR/deploy-error.log"
echo "Deploying \"$vm\" on $( date )"|tee -a "$LOG1" "$LOG2"
- $LEAP_CMD $OPTS -v 2 deploy "$vm" 2>&1 | tee -a "$LOG1" "$LOG2" | egrep -v "$FILTER_ALL" | tee -a "$ERRLOG1" "$ERRLOG2" > /dev/null
+ $LEAP_CMD $OPTS -v 2 deploy "$vm" 2>&1 | tee -a "$LOG1" "$LOG2" | egrep -v "$FILTER_ALL" | ts | tee -a "$ERRLOG1" "$ERRLOG2" > /dev/null
if [ -s "$ERRLOG1" ]
then
@@ -187,7 +187,7 @@ log_start() {
reset_deploy() {
- check_for_running_instances
+ check_for_running_instances || exit $?
local nodes="$*"
update_platform