From c7edf24e4044f0e5faf074b605317b964ae552d3 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 17 May 2017 17:49:55 -0400 Subject: [PATCH] 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 --- ceph-ansible-prs/build/build | 1 + ceph-ansible-scenario/build/build | 1 + ceph-docker-nightly/build/build | 1 + ceph-docker-nightly/build/teardown | 2 -- ceph-docker-prs/build/build | 1 + ceph-docker-prs/build/teardown | 2 -- ceph-installer-tests/build/build | 1 + scripts/build_utils.sh | 9 +++++---- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ceph-ansible-prs/build/build b/ceph-ansible-prs/build/build index 13fbd171..2a9aec94 100644 --- 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 1b966f8d..665c4355 100644 --- 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 bef8cd2e..8b9adb4b 100644 --- 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 a2d47b9e..5790664a 100644 --- 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 bef8cd2e..8b9adb4b 100644 --- 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 a2d47b9e..5790664a 100644 --- 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 3fbadcd1..353c7efd 100644 --- 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 df254790..737070ac 100644 --- 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 } -- 2.39.5