summaryrefslogtreecommitdiffstats
path: root/lava-slave/scripts/setup.sh
diff options
context:
space:
mode:
authorKevin Hilman <khilman@baylibre.com>2019-10-04 07:35:05 -0700
committerGitHub <noreply@github.com>2019-10-04 07:35:05 -0700
commitd7360d5899d7a4cc701634fbb6e3b6d5606dc04b (patch)
tree02c8c3541667d7d15071ca8e8942954ddab66440 /lava-slave/scripts/setup.sh
parent8ebcea50e12756580560b4b6578ad3979682ea59 (diff)
parent4760b0d2372ca68275296e86aa6cfc1f731cd543 (diff)
Merge pull request #104 from montjoie/2019.09
2019.09
Diffstat (limited to 'lava-slave/scripts/setup.sh')
-rwxr-xr-xlava-slave/scripts/setup.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/lava-slave/scripts/setup.sh b/lava-slave/scripts/setup.sh
index 4bf2f67..c39fdc4 100755
--- a/lava-slave/scripts/setup.sh
+++ b/lava-slave/scripts/setup.sh
@@ -105,10 +105,14 @@ do
if [ $? -eq 0 ];then
echo "$devicename already present"
#verify if present on another worker
- #TODO
- lavacli $LAVACLIOPTS devices show $devicename |grep ^worker |grep -q $worker
- if [ $? -ne 0 ];then
- echo "ERROR: $devicename already present on another worker"
+ lavacli $LAVACLIOPTS devices show $devicename |grep ^worker > /tmp/current-worker
+ if [ $? -ne 0 ]; then
+ CURR_WORKER=""
+ else
+ CURR_WORKER=$(cat /tmp/current-worker | sed '^.* ,,')
+ fi
+ if [ ! -z "$CURR_WORKER" -a "$CURR_WORKER" != "$worker" ];then
+ echo "ERROR: $devicename already present on another worker $CURR_WORKER"
exit 1
fi
DEVICE_HEALTH=$(grep "$devicename[[:space:]]" /tmp/devices.list | sed 's/.*,//')