From 5bf7a040a575d2cf69e1ef35149fae620d555f31 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jlebon@redhat.com>
Date: Wed, 7 Dec 2016 15:14:54 -0500
Subject: [PATCH] libvm.sh: strengthen reboot

Unsurprisingly, rebooting machines that are running in OpenStack is
not as reliable or as fast as a local VM, which is what vmcheck was
originally written for and tested against.

Replace the:

  sleep 2 # give time for port to go down

which is rife with raciness, with a stronger boot_id-based check to
ensure we're in a new boot. Run "sync" before rebooting which sometimes
helps (though I didn't fully investigate why or whether it always helps,
there's probably something more subtle going on underneath). Increase
the timeout to 120s.

Closes: #543
Approved by: cgwalters
---
 .redhat-ci.yml        |  2 +-
 tests/common/libvm.sh | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.redhat-ci.yml b/.redhat-ci.yml
index 9d23fc83..c8dd183c 100644
--- a/.redhat-ci.yml
+++ b/.redhat-ci.yml
@@ -60,7 +60,7 @@ inherit: true
 
 context: vmcheck
 
-required: false
+required: true
 
 cluster:
   hosts:
diff --git a/tests/common/libvm.sh b/tests/common/libvm.sh
index 3322f272..7fc1792c 100644
--- a/tests/common/libvm.sh
+++ b/tests/common/libvm.sh
@@ -75,25 +75,32 @@ EOF
 
 # wait until ssh is available on the vm
 # - $1    timeout in second (optional)
+# - $2    previous bootid (optional)
 vm_ssh_wait() {
-  timeout=${1:-0}
+  timeout=${1:-0}; shift
+  old_bootid=${1:-}; shift
   while [ $timeout -gt 0 ]; do
-    if vm_cmd true &> /dev/null; then
-      return 0
+    if bootid=$(vm_get_boot_id 2>/dev/null); then
+        if [[ $bootid != $old_bootid ]]; then
+            return 0
+        fi
     fi
     timeout=$((timeout - 1))
     sleep 1
   done
-  # final check at the timeout mark
-  set -x
-  vm_cmd true
+  false "Timed out while waiting for SSH."
+}
+
+vm_get_boot_id() {
+  vm_cmd cat /proc/sys/kernel/random/boot_id 2>/dev/null
 }
 
 # reboot the vm
 vm_reboot() {
+  vm_cmd sync
+  bootid=$(vm_get_boot_id)
   vm_cmd systemctl reboot || :
-  sleep 2 # give time for port to go down
-  vm_ssh_wait 60
+  vm_ssh_wait 120 $bootid
 }
 
 # check that the given files exist on the VM