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

diff --git a/ci/jjb/shell/vagrant-verify.sh b/ci/jjb/shell/vagrant-verify.sh
index 76ed59b..ec931c2 100644
--- a/ci/jjb/shell/vagrant-verify.sh
+++ b/ci/jjb/shell/vagrant-verify.sh
@@ -6,21 +6,14 @@ echo "---> vagrant-verify.sh"
 set -exuf -o pipefail
 
 function clean_vm {{
-    # 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
 }}
 trap clean_vm EXIT
 
 # 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