use libvirt util methods in all jobs that use libvirt

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/ceph-ansible-prs/build/build b/ceph-ansible-prs/build/build
index 34fcbae8af6eae3b62b3e10f6171fdfd26621146..13fbd171f82e462dca0709ac8372c4dec96df7ef 100644 (file)
--- a/ceph-ansible-prs/build/build
+++ b/ceph-ansible-prs/build/build
@@ -9,16 +9,8 @@ source $VENV/activate
 
 WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
 
-# Sometimes, networks may linger around, so we must ensure they are killed:
-networks=`sudo virsh net-list --all | grep active | egrep -v "(default|libvirt)" | cut -d ' ' -f 2`
-for network in $networks; do
-    sudo virsh net-destroy $network || true
-    sudo virsh net-undefine $network || true
-done
-
-# restart libvirt services
-sudo service libvirt-bin restart
-sudo service libvirt-guests restart
+clear_libvirt_networks
+restart_libvirt_services
 
 # the $SCENARIO var is injected by the job template. It maps
 # to an actual, defined, tox environment

diff --git a/ceph-ansible-scenario/build/build b/ceph-ansible-scenario/build/build
index 9da5957b7bbb63a40df8094099a6f2dbe54ad076..1b966f8d542eaaed1cdb47c0c8917b01327da179 100644 (file)
--- a/ceph-ansible-scenario/build/build
+++ b/ceph-ansible-scenario/build/build
@@ -9,16 +9,8 @@ source $VENV/activate
 
 WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
 
-# Sometimes, networks may linger around, so we must ensure they are killed:
-networks=`sudo virsh net-list --all | grep active | egrep -v "(default|libvirt)" | cut -d ' ' -f 2`
-for network in $networks; do
-    sudo virsh net-destroy $network || true
-    sudo virsh net-undefine $network || true
-done
-
-# restart libvirt services
-sudo service libvirt-bin restart
-sudo service libvirt-guests restart
+clear_libvirt_networks
+restart_libvirt_services
 
 # the $SCENARIO var is injected by the job configuration. It maps
 # to an actual, defined, tox environment

diff --git a/ceph-docker-nightly/build/build b/ceph-docker-nightly/build/build
index 43362a100bc927bf2668bff7962e03e2d48b499c..bef8cd2e59cca56c1233c3aecc27693b257eff20 100644 (file)
--- a/ceph-docker-nightly/build/build
+++ b/ceph-docker-nightly/build/build
@@ -15,16 +15,8 @@ sudo gpasswd -a ${USER} docker
 sudo systemctl restart docker
 newgrp docker
 
-# Sometimes, networks may linger around, so we must ensure they are killed:
-networks=`sudo virsh net-list --all | grep active | egrep -v "(default|libvirt)" | cut -d ' ' -f 2`
-for network in $networks; do
-    sudo virsh net-destroy $network || true
-    sudo virsh net-undefine $network || true
-done
-
-# restart libvirt services
-sudo service libvirt-bin restart
-sudo service libvirt-guests restart
+clear_libvirt_networks
+restart_libvirt_services
 
 # adding groups on the fly doesn't guarantee their availability
 # so we must use `sg` to execute the tests as part of the docker group to avoid

diff --git a/ceph-docker-prs/build/build b/ceph-docker-prs/build/build
index 43362a100bc927bf2668bff7962e03e2d48b499c..bef8cd2e59cca56c1233c3aecc27693b257eff20 100644 (file)
--- a/ceph-docker-prs/build/build
+++ b/ceph-docker-prs/build/build
@@ -15,16 +15,8 @@ sudo gpasswd -a ${USER} docker
 sudo systemctl restart docker
 newgrp docker
 
-# Sometimes, networks may linger around, so we must ensure they are killed:
-networks=`sudo virsh net-list --all | grep active | egrep -v "(default|libvirt)" | cut -d ' ' -f 2`
-for network in $networks; do
-    sudo virsh net-destroy $network || true
-    sudo virsh net-undefine $network || true
-done
-
-# restart libvirt services
-sudo service libvirt-bin restart
-sudo service libvirt-guests restart
+clear_libvirt_networks
+restart_libvirt_services
 
 # adding groups on the fly doesn't guarantee their availability
 # so we must use `sg` to execute the tests as part of the docker group to avoid

diff --git a/ceph-installer-tests/build/build b/ceph-installer-tests/build/build
index 350b13d3acae5441add23a508bcd60a0637b4d2d..3fbadcd180b68f3998e12e501e9819049d542389 100644 (file)
--- a/ceph-installer-tests/build/build
+++ b/ceph-installer-tests/build/build
@@ -6,15 +6,7 @@ WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
 
 cd $WORKSPACE/tests/functional
 
-# Sometimes, networks may linger around, so we must ensure they are killed:
-networks=`sudo virsh net-list --all | grep active | egrep -v "(default|libvirt)" | cut -d ' ' -f 2`
-for network in $networks; do
-    sudo virsh net-destroy $network || true
-    sudo virsh net-undefine $network || true
-done
-
-# restart libvirt services
-sudo service libvirt-bin restart
-sudo service libvirt-guests restart
+clear_libvirt_networks
+restart_libvirt_services
 
 INSTALLER_DEV_BRANCH=$INSTALLER_BRANCH CEPH_ANSIBLE_DEV_BRANCH=$CEPH_ANSIBLE_BRANCH $VENV/tox -rv -e=$SCENARIO --workdir=$WORKDIR -- --provider=libvirt