Add note to Jenkins setup about Git plugin

[icn.git] / ci / jjb / shell / vagrant-verify.sh

diff --git a/ci/jjb/shell/vagrant-verify.sh b/ci/jjb/shell/vagrant-verify.sh
index 76ed59b..ec931c2 100644 (file)
--- 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