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=29a86ee85704669d02fb421ea3a98ce352a2a492;hpb=9385db78e6dda67ce1cfe51a663fde4235306817;p=icn.git

diff --git a/ci/jjb/shell/bluval.sh b/ci/jjb/shell/bluval.sh
index 29a86ee..6dc4245 100644
--- a/ci/jjb/shell/bluval.sh
+++ b/ci/jjb/shell/bluval.sh
@@ -4,22 +4,20 @@
 # Disable 'globbing'
 set -eux -o pipefail
 
-SCRIPT_DIR="$(readlink -f $(dirname ${BASH_SOURCE[0]}))"
-
 echo "[ICN] Downloading ICN"
-git clone "https://gerrit.akraino.org/r/icn"
+git clone "https://gerrit.akraino.org/r/icn" ${WORKSPACE}/icn
 
 echo "[ICN] Bringing up test cluster"
 function clean_vm {
-    pushd ${SCRIPT_DIR}/icn
-    vagrant destroy -f
+    pushd ${WORKSPACE}/icn
+    ./tools/vagrant/destroy.rb
     popd
 }
 trap clean_vm EXIT
-pushd icn
+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
@@ -29,7 +27,7 @@ sudo su -c 'make jump_server vm_cluster'
 popd
 
 echo "[ICN] Installing jenkins identity into test cluster"
-cp ${SCRIPT_DIR}/icn/deploy/site/vm/id_rsa site-vm-rsa
+cp ${WORKSPACE}/icn/deploy/site/vm/id_rsa site-vm-rsa
 chmod 0600 site-vm-rsa
 ssh-keygen -f ${CLUSTER_SSH_KEY} -y > ${CLUSTER_SSH_KEY}.pub
 ssh-copy-id -i ${CLUSTER_SSH_KEY} -f ${CLUSTER_SSH_USER}@${CLUSTER_MASTER_IP} -o IdentityFile=site-vm-rsa -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null