sepia-fog-images: Don't wait for machines to reboot after capture

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/sepia-fog-images/build/build b/sepia-fog-images/build/build
index 09c06c919aa98fed6c8c74feb5731f333885d165..b0710ff453d10c00129560192655bd4119b920df 100755 (executable)
--- a/sepia-fog-images/build/build
+++ b/sepia-fog-images/build/build
@@ -163,27 +163,9 @@ while [ $capturetasks -gt 0 ]; do
   capturetasks=$(curl -s -k -H "fog-api-token: ${FOG_API_TOKEN}" -H "fog-user-token: ${FOG_USER_TOKEN}" http://fog.front.sepia.ceph.com/fog/task/active -d '{"typeID": "'${fogcaptureid}'"}' -X GET | jq -r '.count')
 done
 
-# Don't bail if machines aren't ready yet
-set +e
-
-# Wait for hosts to come back up after getting images captured
-remaininghosts=$allhosts
-while [ "$remaininghosts" != "" ]; do
-  for host in $remaininghosts; do
-    if ssh -q ubuntu@${host}.front.sepia.ceph.com stat /ceph-qa-ready \> /dev/null 2\>\&1; then
-      remaininghosts=$(echo $remaininghosts | sed -e "s/ *$host *//")
-    else
-      echo "$(date) -- $host is not ready.  Sleeping for 10sec"
-      sleep 10
-    fi
-  done
-done
-
 set -ex
 
-# Update lock db and unlock machines!
+# Unlock all machines after all capture images are finished
 for host in $allhosts; do
-  teuthology-updatekeys ubuntu@${host}
-  teuthology-update-inventory ${host}
   teuthology-lock --unlock $host
 done

diff --git a/sepia-fog-images/build/failure b/sepia-fog-images/build/failure
index bfa8e70dd4b310d857a8a16c52009500e26a3013..a19968998d0bb332c389e8cc5839f0033cea7ffd 100755 (executable)
--- a/sepia-fog-images/build/failure
+++ b/sepia-fog-images/build/failure
@@ -49,9 +49,7 @@ done
 
 set +e
 
-# Try to update lock DB (in case whomever debugs Jenkins job failure forgets)
+# Just unlock machines.  FOG will reimage them on the next job they run.
 for host in $allhosts; do
-  teuthology-updatekeys ubuntu@${host}
-  teuthology-update-inventory ${host}
   teuthology-lock --unlock $host
 done