scripts: Be more aggressive with deleting libvirt VMs

This PR ensures all slaves that use tox & Vagrant don't have any running libvirt VMs that could cause IP collisions

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

diff --git a/ceph-ansible-prs/build/build b/ceph-ansible-prs/build/build
index 13fbd171f82e462dca0709ac8372c4dec96df7ef..2a9aec94584680edbec3b6ac6543fa4ad525c267 100644 (file)
--- a/ceph-ansible-prs/build/build
+++ b/ceph-ansible-prs/build/build
@@ -9,6 +9,7 @@ source $VENV/activate
 
 WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
 
+delete_libvirt_vms
 clear_libvirt_networks
 restart_libvirt_services
 

diff --git a/ceph-ansible-scenario/build/build b/ceph-ansible-scenario/build/build
index 1b966f8d542eaaed1cdb47c0c8917b01327da179..665c435568a5b0f276a5cab4ab36e95bb0a6d17e 100644 (file)
--- a/ceph-ansible-scenario/build/build
+++ b/ceph-ansible-scenario/build/build
@@ -9,6 +9,7 @@ source $VENV/activate
 
 WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
 
+delete_libvirt_vms
 clear_libvirt_networks
 restart_libvirt_services
 

diff --git a/ceph-docker-nightly/build/build b/ceph-docker-nightly/build/build
index bef8cd2e59cca56c1233c3aecc27693b257eff20..8b9adb4bc8be60a2fe5c5f267a5b189c548a5ba1 100644 (file)
--- a/ceph-docker-nightly/build/build
+++ b/ceph-docker-nightly/build/build
@@ -15,6 +15,7 @@ sudo gpasswd -a ${USER} docker
 sudo systemctl restart docker
 newgrp docker
 
+delete_libvirt_vms
 clear_libvirt_networks
 restart_libvirt_services
 

diff --git a/ceph-docker-nightly/build/teardown b/ceph-docker-nightly/build/teardown
index a2d47b9eb514d7d8dd2b634ff18b2d243e17d36c..5790664af45ac7df20337be27b611f143e45a609 100644 (file)
--- a/ceph-docker-nightly/build/teardown
+++ b/ceph-docker-nightly/build/teardown
@@ -11,5 +11,3 @@ for scenario in $scenarios; do
     vagrant destroy -f
     cd -
 done
-
-delete_vagrant_docker_vms

diff --git a/ceph-docker-prs/build/build b/ceph-docker-prs/build/build
index bef8cd2e59cca56c1233c3aecc27693b257eff20..8b9adb4bc8be60a2fe5c5f267a5b189c548a5ba1 100644 (file)
--- a/ceph-docker-prs/build/build
+++ b/ceph-docker-prs/build/build
@@ -15,6 +15,7 @@ sudo gpasswd -a ${USER} docker
 sudo systemctl restart docker
 newgrp docker
 
+delete_libvirt_vms
 clear_libvirt_networks
 restart_libvirt_services
 

diff --git a/ceph-docker-prs/build/teardown b/ceph-docker-prs/build/teardown
index a2d47b9eb514d7d8dd2b634ff18b2d243e17d36c..5790664af45ac7df20337be27b611f143e45a609 100644 (file)
--- a/ceph-docker-prs/build/teardown
+++ b/ceph-docker-prs/build/teardown
@@ -11,5 +11,3 @@ for scenario in $scenarios; do
     vagrant destroy -f
     cd -
 done
-
-delete_vagrant_docker_vms

diff --git a/ceph-installer-tests/build/build b/ceph-installer-tests/build/build
index 3fbadcd180b68f3998e12e501e9819049d542389..353c7efd0c03746d2dd2560eb7f4a5676ae20313 100644 (file)
--- a/ceph-installer-tests/build/build
+++ b/ceph-installer-tests/build/build
@@ -6,6 +6,7 @@ WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
 
 cd $WORKSPACE/tests/functional
 
+delete_libvirt_vms
 clear_libvirt_networks
 restart_libvirt_services
 

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index df2547903f5675bbedd6b38fe4d1832531736ff7..737070acde47e75eb83e8a4bd28c4536f28ffcda 100644 (file)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -407,16 +407,17 @@ setup_pbuilder() {
     fi
 }
 
-delete_vagrant_docker_vms() {
-    # Delete any vagrant/libvirt VMs leftover from a failed docker build
-    libvirt_vms=`sudo virsh list --all --name | grep docker`
+delete_libvirt_vms() {
+    # Delete any VMs leftover from previous builds.
+    # Primarily used for Vagrant VMs leftover from docker builds.
+    libvirt_vms=`sudo virsh list --all --name`
     for vm in $libvirt_vms; do
         # Destroy returns a non-zero rc if the VM's not running
         sudo virsh destroy $vm || true
         sudo virsh undefine $vm || true
     done
     # Clean up any leftover disk images
-    sudo rm -f /var/lib/libvirt/images/docker*.img
+    sudo rm -f /var/lib/libvirt/images/*.img
     sudo virsh pool-refresh default
 }