Merge pull request #4571 from pacevedom/USHIFT-5402

USHIFT-5402: Test harness VM IP address robustness

Author: openshift-merge-bot[bot]

scripts/devenv-builder/manage-vm.sh

@@ -21,10 +21,17 @@ SSH_PASSWORD_OPTS="-o PubkeyAuthentication=no -o PreferredAuthentications=passwo
 
 # Show the IP address of the VM
 function get_ip {
-    sudo virsh domifaddr "$1" \
-        | grep ipv \
-        | awk '{print $4}' \
-        | cut -f1 -d/
+    # To avoid stale DHCP leases test each of the IP addresses reported by
+    # domifaddr. Include it only if the VM responds to a ping.
+    # In order to have a predictable output, list ipv4 first and then ipv6.
+    for ipv in ipv4 ipv6; do
+        iplist=$(sudo virsh domifaddr "$1" | grep "${ipv}" | awk '{print $4}' | cut -f1 -d/ || true)
+        for ip in ${iplist}; do
+            if ping -c 1 -W 1 "${ip}" &> /dev/null; then
+                echo "${ip}"
+            fi
+        done
+    done
 }
 
 # Use the RHEL version and other settings to build a unique VM name

test/bin/scenario.sh

@@ -339,14 +339,19 @@ function get_vm_ip {
     local -r start=$(date +%s)
     local ip
     ip=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | head -1)
-    while [ "${ip}" = "" ]; do
+    while true; do
         now=$(date +%s)
         if [ $(( now - start )) -ge ${VM_BOOT_TIMEOUT} ]; then
             echo "Timed out while waiting for IP retrieval"
             exit 1
         fi
         sleep 1
+        # Try pinging the IP address to avoid stale DHCP leases that would falsely
+        # return as the current IP for the VM.
         ip=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | head -1)
+        if ping -c 1 -W 1 "${ip}" &> /dev/null; then
+          break
+        fi
     done
     echo "${ip}"
 }

test/scenarios-bootc/presubmits/[email protected]

@@ -13,8 +13,9 @@ scenario_remove_vms() {
 
 scenario_run_tests() {
     local -r vmname=$(full_vm_name host1)
+    # Valid IP addresses are the first two entries returned by manage-vm script.
     local -r vm_ip1=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | head -1)
-    local -r vm_ip2=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | tail -1)
+    local -r vm_ip2=$("${ROOTDIR}/scripts/devenv-builder/manage-vm.sh" ip -n "${vmname}" | head -2 | tail -1)
 
     run_tests host1 \
         --variable "USHIFT_HOST_IP1:${vm_ip1}" \