From a686fc2f61637a8554c55444efc748eb29f63f83 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Wed, 1 Aug 2018 16:45:51 +0200 Subject: Do not change status for retired/maintenance re-added devices When re-adding devices to a worker, setup.sh re-add them with UNKNOWN status. This patch prevent this for RETIRED/MAINTENANCE status and keep it. --- lava-slave/scripts/setup.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'lava-slave') diff --git a/lava-slave/scripts/setup.sh b/lava-slave/scripts/setup.sh index 0105fbe..e7992c0 100755 --- a/lava-slave/scripts/setup.sh +++ b/lava-slave/scripts/setup.sh @@ -90,7 +90,22 @@ do echo "ERROR: $devicename already present on another worker" exit 1 fi - lavacli $LAVACLIOPTS devices update --worker $worker --health UNKNOWN $devicename || exit $? + DEVICE_HEALTH=$(grep "$devicename[[:space:]]" /tmp/devices.list | sed 's/.*,//') + case "$DEVICE_HEALTH" in + Retired) + echo "DEBUG: Keep $devicename state: $DEVICE_HEALTH" + DEVICE_HEALTH='RETIRED' + ;; + Maintenance) + echo "DEBUG: Keep $devicename state: $DEVICE_HEALTH" + DEVICE_HEALTH='MAINTENANCE' + ;; + *) + echo "DEBUG: Set $devicename state to UNKNOWN (from $DEVICE_HEALTH)" + DEVICE_HEALTH='UNKNOWN' + ;; + esac + lavacli $LAVACLIOPTS devices update --worker $worker --health $DEVICE_HEALTH $devicename || exit $? # always reset the device dict in case of update of it lavacli $LAVACLIOPTS devices dict set $devicename /root/devices/$worker/$device || exit $? else -- cgit 1.2.3-korg