From 7e03f635533d4b94f31869d557d798c8d933daf2 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 2 May 2017 07:49:23 -0500 Subject: [PATCH] use libvirt util methods in all jobs that use libvirt Signed-off-by: Andrew Schoen --- ceph-ansible-prs/build/build | 12 ++---------- ceph-ansible-scenario/build/build | 12 ++---------- ceph-docker-nightly/build/build | 12 ++---------- ceph-docker-prs/build/build | 12 ++---------- ceph-installer-tests/build/build | 12 ++---------- 5 files changed, 10 insertions(+), 50 deletions(-) diff --git a/ceph-ansible-prs/build/build b/ceph-ansible-prs/build/build index 34fcbae8..13fbd171 100644 --- 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 9da5957b..1b966f8d 100644 --- 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 43362a10..bef8cd2e 100644 --- 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 43362a10..bef8cd2e 100644 --- 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 350b13d3..3fbadcd1 100644 --- 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 -- 2.39.5