Clean libvirt volumes and display license details when checking images (

#162)
ruzickap · Aug 10, 2020 · 28ea724 · 28ea724
1 parent 9e440a6
commit 28ea724
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
     name: "*"
     runs-on: [self-hosted, linux, x64]
     strategy:
-      max-parallel: 2
+      max-parallel: 1
       fail-fast: false
       matrix:
         stage:
@@ -107,7 +107,7 @@ jobs:
     runs-on: [self-hosted, linux, x64]
     needs: build-libvirt
     strategy:
-      max-parallel: 2
+      max-parallel: 1
       fail-fast: false
       matrix:
         stage:

diff --git a/tools/cleanup_all_vms.sh b/tools/cleanup_all_vms.sh
@@ -53,14 +53,22 @@ done <   <(VBoxManage list hdds | grep '^UUID:')
 
 test -d "${HOME}/VirtualBox VMs" && rm -rvf "${HOME}/VirtualBox VMs"
 
-echo "*** Remove all libvirt instances"
-for VM in $(virsh --connect=qemu:///system list --all --name); do
-  echo "*** ${VM}"
-  if virsh --connect=qemu:///system dominfo "${VM}" | grep -q running; then
-    virsh --connect=qemu:///system destroy "${VM}"
-  fi
-  virsh --connect=qemu:///system undefine --remove-all-storage "${VM}"
-done
+if command -v virsh &>/dev/null; then
+  echo "*** Remove all libvirt instances"
+  for VM in $(virsh --connect=qemu:///system list --all --name); do
+    echo "*** ${VM}"
+    if virsh --connect=qemu:///system dominfo "${VM}" | grep -q running; then
+      virsh --connect=qemu:///system destroy "${VM}"
+    fi
+    virsh --connect=qemu:///system undefine --remove-all-storage "${VM}"
+  done
+
+  echo "*** Remove all libvirt disks"
+  for VOL in $(virsh vol-list default | awk '/.img/ { print $1 }'); do
+    echo "*** ${VOL}"
+    virsh vol-delete "${VOL}" --pool default
+  done
+fi
 
 if [[ -d "${LOGDIR}" ]]; then
   echo "*** Remove directory: ${LOGDIR}"

diff --git a/vagrant_init_destroy_boxes.sh b/vagrant_init_destroy_boxes.sh
@@ -31,6 +31,8 @@ check_vagrant_vm() {
       vagrant winrm --shell cmd --command 'systeminfo | findstr /B /C:"OS Name" /C:"OS Version"'
       echo "*** Running: vagrant winrm --shell powershell --command 'Get-Service ...'"
       vagrant winrm --shell powershell --command "Get-ChildItem -Path Cert:\LocalMachine\TrustedPublisher; Get-Service | where {\$_.Name -match \".*QEMU.*|.*Spice.*|.*vdservice.*|.*VBoxService.*\"}; Get-WmiObject -Class Win32_Product; Get-WmiObject Win32_PnPSignedDriver | where {\$_.devicename -match \".*Red Hat.*|.*VirtIO.*\"} | select devicename, driverversion" | uniq
+      echo "*** Running: vagrant winrm --shell powershell --command 'cscript slmgr.vbs...'"
+      vagrant winrm --shell cmd --command 'cscript C:\Windows\System32\slmgr.vbs /dli'
       echo "*** vagrant winrm --shell powershell --command .... finished"
     ;;
     *centos* | *ubuntu* )