X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ci%2Fjjb%2Fshell%2Fbluval.sh;h=6dc42456f6720f54bbc51a684485181779f6e6b3;hb=refs%2Fchanges%2F52%2F4752%2F1;hp=bfb6ff6ab9e9dd2e79303f1470e7a7442dca8a3d;hpb=f056a7ebac7dae36cee4f9bfd4869e9de76ad6f7;p=icn.git

diff --git a/ci/jjb/shell/bluval.sh b/ci/jjb/shell/bluval.sh
index bfb6ff6..6dc4245 100644
--- a/ci/jjb/shell/bluval.sh
+++ b/ci/jjb/shell/bluval.sh
@@ -10,21 +10,14 @@ git clone "https://gerrit.akraino.org/r/icn" ${WORKSPACE}/icn
 echo "[ICN] Bringing up test cluster"
 function clean_vm {
     pushd ${WORKSPACE}/icn
-    # TODO Vagrant has a known issue
-    # (https://github.com/vagrant-libvirt/vagrant-libvirt/issues/1371)
-    # destroying the VMs, so destroy them manually here
-    vagrant destroy -f jump
-    virsh -c qemu:///system destroy vm-machine-1
-    virsh -c qemu:///system undefine --nvram --remove-all-storage vm-machine-1
-    virsh -c qemu:///system destroy vm-machine-2
-    virsh -c qemu:///system undefine --nvram --remove-all-storage vm-machine-2
+    ./tools/vagrant/destroy.rb
     popd
 }
 trap clean_vm EXIT
 pushd ${WORKSPACE}/icn
 # TODO Improve VM performance by only using cores on the same node
 #sed -i -e '/^\s\+libvirt.cpus/!b' -e "h;s/\S.*/libvirt.cpuset = '0-21,44-65'/;H;g" Vagrantfile
-vagrant destroy -f
+./tools/vagrant/destroy.rb
 vagrant up --no-parallel
 vagrant ssh jump -c "
 set -exuf