use teardown_vagrant_tests on jobs that use vagrant

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

diff --git a/ceph-ansible-nightly/build/teardown b/ceph-ansible-nightly/build/teardown
index 7f2137f482f36f3ac5b7ced46deba2f21c330b68..350248e524d88f91e9dfd934189035bcf8d471ae 100644 (file)
--- a/ceph-ansible-nightly/build/teardown
+++ b/ceph-ansible-nightly/build/teardown
@@ -1,22 +1,6 @@
 #!/bin/bash
-# There has to be a better way to do this than this script which just looks
-# for every Vagrantfile in scenarios and then just destroys whatever is left.
 
 cd $WORKSPACE/tests
 
-scenarios=$(find . | grep Vagrantfile | xargs dirname)
-
-for scenario in $scenarios; do
-    cd $scenario
-    # collect all ceph logs from all test nodes
-    collect_ceph_logs all
-    vagrant destroy -f
-    cd -
-done
-
-# 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
+# the method exists in scripts/build_utils.sh
+teardown_vagrant_tests

diff --git a/ceph-ansible-prs/build/teardown b/ceph-ansible-prs/build/teardown
index 09d3862ff75376e7e8a38ab9006332e56bd78fe8..350248e524d88f91e9dfd934189035bcf8d471ae 100644 (file)
--- a/ceph-ansible-prs/build/teardown
+++ b/ceph-ansible-prs/build/teardown
@@ -1,22 +1,6 @@
 #!/bin/bash
-# There has to be a better way to do this than this script which just looks
-# for every Vagrantfile in scenarios and then just destroys whatever is left.
 
 cd $WORKSPACE/tests
 
-scenarios=$(find . -name Vagrantfile | xargs dirname)
-
-for scenario in $scenarios; do
-    pushd $scenario
-    # collect all ceph logs from all test nodes
-    collect_ceph_logs all
-    vagrant destroy -f
-    popd
-done
-
-# 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
+# the method exists in scripts/build_utils.sh
+teardown_vagrant_tests

diff --git a/ceph-ansible-scenario/build/teardown b/ceph-ansible-scenario/build/teardown
index 7f2137f482f36f3ac5b7ced46deba2f21c330b68..350248e524d88f91e9dfd934189035bcf8d471ae 100644 (file)
--- a/ceph-ansible-scenario/build/teardown
+++ b/ceph-ansible-scenario/build/teardown
@@ -1,22 +1,6 @@
 #!/bin/bash
-# There has to be a better way to do this than this script which just looks
-# for every Vagrantfile in scenarios and then just destroys whatever is left.
 
 cd $WORKSPACE/tests
 
-scenarios=$(find . | grep Vagrantfile | xargs dirname)
-
-for scenario in $scenarios; do
-    cd $scenario
-    # collect all ceph logs from all test nodes
-    collect_ceph_logs all
-    vagrant destroy -f
-    cd -
-done
-
-# 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
+# the method exists in scripts/build_utils.sh
+teardown_vagrant_tests

diff --git a/ceph-volume-ansible-prs/build/teardown b/ceph-volume-ansible-prs/build/teardown
index 6eb73ad85bb65674334c7e86c5885f5aff27c889..987bf263e916efa7d2cc530382768130fd51364f 100644 (file)
--- a/ceph-volume-ansible-prs/build/teardown
+++ b/ceph-volume-ansible-prs/build/teardown
@@ -10,20 +10,5 @@ GITHUB_STATUS_STATE="failure" $VENV/github-status create
 
 cd $WORKSPACE/src/ceph-volume/tests/functional
 
-scenarios=$(find . | grep Vagrantfile | xargs dirname)
-
-for scenario in $scenarios; do
-    cd $scenario
-    # collect all ceph logs from all test nodes
-    collect_ceph_logs all
-    vagrant destroy -f
-    cd -
-done
-
-# 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
-
+# the method exists in scripts/build_utils.sh
+teardown_vagrant_tests

diff --git a/ceph-volume-nightly/build/teardown b/ceph-volume-nightly/build/teardown
index 6ba0b950bc6741e58a3291389dfc022d2dfad393..ce026872d4ecd140f4549482a11948f476beb69d 100644 (file)
--- a/ceph-volume-nightly/build/teardown
+++ b/ceph-volume-nightly/build/teardown
@@ -7,18 +7,5 @@ cd $WORKSPACE/src/ceph-volume/ceph_volume/tests/functional
 
 scenarios=$(find . | grep vagrant_ssh_config | xargs dirname)
 
-for scenario in $scenarios; do
-    cd $scenario
-    # collect all ceph logs from all test nodes
-    collect_ceph_logs all
-    vagrant destroy -f
-    cd -
-done
-
-# 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
-
+# the method exists in scripts/build_utils.sh
+teardown_vagrant_tests

diff --git a/ceph-volume-scenario/build/teardown b/ceph-volume-scenario/build/teardown
index 1e9180a6256d29dbdc259b65d02ee63e32aba8d5..a5c26da80715e3eefe5cf2e5fb894f9be3853b3b 100644 (file)
--- a/ceph-volume-scenario/build/teardown
+++ b/ceph-volume-scenario/build/teardown
@@ -1,24 +1,6 @@
 #!/bin/bash
-# There has to be a better way to do this than this script which just looks
-# for every Vagrantfile in scenarios and then just destroys whatever is left.
-
 
 cd $WORKSPACE/src/ceph-volume/ceph_volume/tests/functional
 
-scenarios=$(find . | grep Vagrantfile | xargs dirname)
-
-for scenario in $scenarios; do
-    cd $scenario
-    # collect all ceph logs from all test nodes
-    collect_ceph_logs all
-    vagrant destroy -f
-    cd -
-done
-
-# 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
-
+# the method exists in scripts/build_utils.sh
+teardown_vagrant_tests