summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-10-31 22:27:03 +0000
committervarac <varacanero@zeromail.org>2015-10-31 22:27:03 +0000
commit567d76f1fa661a010a6a8b7eb73deac7ed1d0481 (patch)
tree698de6a72bcbc68de2409b0574a16c9366f05776
parentce1c23d95c2b4f72ff21dfad14b7f17915cda7a7 (diff)
fix versions() call
-rwxr-xr-xleap-platform-test20
1 files changed, 8 insertions, 12 deletions
diff --git a/leap-platform-test b/leap-platform-test
index 05fd741..b6ca3e5 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -503,20 +503,15 @@ versions () {
cd "$PROVIDERDIR"
[ -d .git ] && provider_head=$( git rev-parse HEAD )
- if [ -n "$provider_head" ]
+ if [ -z "$provider_head" ]
then
provider_head='not under version control'
fi
- echo "Provider ($PROVIDERDIR): $provider_head"
+ echo "Provider config ($PROVIDERDIR): $provider_head"
echo
- $LEAP_CMD -v 2 list | grep ' = leap command v'
- echo
- echo
-
- #echo "leap_platform:"
- $LEAP_CMD -v 2 list | grep ' = leap platform v'
+ $LEAP_CMD --version
echo
echo
}
@@ -601,10 +596,6 @@ LOCKFILE="${LOCKFILE_DIR}/$(basename $0).lock"
FAILURE_LOCKFILE="${LOCKFILE_DIR}/failure.lock"
exitcode=0
-check_for_running_instances || exit $?
-
-# set branch specifc lockfile so a deploy test cannot be run twice in parallel
-touch $LOCKFILE
[ -e "$PROVIDERDIR" ] && cd "$PROVIDERDIR"
@@ -623,6 +614,11 @@ then
exit 1
fi
+check_for_running_instances || exit $?
+
+# set branch specifc lockfile so a deploy test cannot be run twice in parallel
+touch $LOCKFILE
+
if $all ; then
# use NODES variable from the config file
nodes=$NODES