CI: add -x for debugging to install-windows-updates script

Author: aramprice

ci/tasks/install-windows-updates/run.sh

@@ -1,23 +1,23 @@
 #!/bin/bash
-
-set -eu
+set -eu -o pipefail
+set -x
 
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 
-source ${SCRIPT_DIR}/../../common-scripts/update_nimbus_urls_and_cert.sh
+source "${SCRIPT_DIR}/../../common-scripts/update_nimbus_urls_and_cert.sh"
 
 cat > ca.crt <<END_OF_CERT
 $VCENTER_CA_CERT
 END_OF_CERT
 export GOVC_TLS_CA_CERTS=ca.crt
 
 vm_ipath=${STEMBUILD_CONSTRUCT_TARGET_VM}
-vm_username=${VM_USERNAME}
-vm_password=${VM_PASSWORD}
+vm_username="${VM_USERNAME}"
+vm_password="${VM_PASSWORD}"
 
 powershell_exe="\\Windows\\System32\\WindowsPowerShell\\V1.0\\powershell.exe"
 
-govc_pwsh_cmd="govc guest.start -vm.ipath=${vm_ipath} -l=${vm_username}:${vm_password} $powershell_exe"
+govc_pwsh_cmd="govc guest.start -vm.ipath=${vm_ipath} -l=${vm_username}:${vm_password} ${powershell_exe}"
 
 # get wu-install /wu-update set up to work on the vm...
 
@@ -37,9 +37,9 @@ function run_pwsh_command_with_govc() {
   command=$1
   echo "Running $command"
   pid=$(
-    $govc_pwsh_cmd ${command}
+    ${govc_pwsh_cmd} "${command}"
   )
-  return=$(govc guest.ps -vm.ipath="${vm_ipath}" -l="${vm_username}:${vm_password}" -p=${pid} -X -json | jq '.processInfo[0].exitCode')
+  return=$(govc guest.ps -vm.ipath="${vm_ipath}" -l="${vm_username}:${vm_password}" -p="${pid}" -X -json | jq '.processInfo[0].exitCode')
   echo "${command} returned ${return}"
 }
 
@@ -50,22 +50,22 @@ run_pwsh_command_with_govc 'Install-Module -Name PSWindowsUpdate -MinimumVersion
 
 returnWindowsUpdateCount="exit (([array](Get-WindowsUpdate)).Count)"
 echo "getting update count"
-get_update_count_pid=$($govc_pwsh_cmd ${returnWindowsUpdateCount})
+get_update_count_pid=$(${govc_pwsh_cmd} "${returnWindowsUpdateCount}")
 echo "getting update count exit code via guest.ps"
-updates_remaining=$(govc guest.ps -vm.ipath="${vm_ipath}" -l="${vm_username}:${vm_password}" -p=${get_update_count_pid} -X -json | jq '.processInfo[0].exitCode')
+updates_remaining=$(govc guest.ps -vm.ipath="${vm_ipath}" -l="${vm_username}:${vm_password}" -p="${get_update_count_pid}" -X -json | jq '.processInfo[0].exitCode')
+
 echo "Windows Updates to install: $updates_remaining"
 while [[ updates_remaining -ne 0 ]]; do
-
   install_update_pid=$(
-    $govc_pwsh_cmd Install-WindowsUpdate -AcceptAll -AutoReboot
+    ${govc_pwsh_cmd} Install-WindowsUpdate -AcceptAll -AutoReboot
   )
   echo "install-WU pid is $install_update_pid"
 
 
   # ignore unreachable agent if the vm just went down for reboot
   # -X blocks until the guest process exits
   set +e
-  govc guest.ps -vm.ipath="${vm_ipath}" -l="${vm_username}:${vm_password}" -p=${install_update_pid} -X
+  govc guest.ps -vm.ipath="${vm_ipath}" -l="${vm_username}:${vm_password}" -p="${install_update_pid}" -X
   set -e
   echo "Install-WU done"
 
@@ -76,19 +76,19 @@ while [[ updates_remaining -ne 0 ]]; do
 
   echo "VM reachable"
   updates_remaining=
-  while [[ -z "$updates_remaining" ]] ; do
+  while [[ -z "${updates_remaining}" ]] ; do
     echo "Trying to discover how many updates remain..."
     # ignore failures here since the vmware tools agent may be down while updates are being applied
     set +e
-    get_update_count_pid=$($govc_pwsh_cmd ${returnWindowsUpdateCount})
-    updates_remaining=$(govc guest.ps -vm.ipath="${vm_ipath}" -l="${vm_username}:${vm_password}" -p=${get_update_count_pid} -X -json | jq '.ProcessInfo[0].ExitCode')
+    get_update_count_pid=$(${govc_pwsh_cmd} "${returnWindowsUpdateCount}")
+    updates_remaining=$(govc guest.ps -vm.ipath="${vm_ipath}" -l="${vm_username}:${vm_password}" -p="${get_update_count_pid}" -X -json | jq '.ProcessInfo[0].ExitCode')
     set -e
   done
-  echo "Updates remaining: $updates_remaining"
+  echo "Updates remaining: ${updates_remaining}"
 done
 
 run_pwsh_command_with_govc "Get-Hotfix > C:\\hotfix.log"
 
-govc guest.download -l ${vm_username}:${vm_password} -vm=${vm_ipath} "C:\\hotfix.log" hotfix-log/hotfixes.log
+govc guest.download -l "${vm_username}:${vm_password}" -vm="${vm_ipath}" "C:\\hotfix.log" hotfix-log/hotfixes.log
 
 run_pwsh_command_with_govc "Dism.exe /online /Cleanup-Image /StartComponentCleanup"