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=7f364c8571cbca3f62961fedac8f5d033c617a96;hpb=a5b14027dc81c5fc2ed37b23a5e656ebecf6ddfa;p=icn.git

diff --git a/ci/jjb/shell/bluval.sh b/ci/jjb/shell/bluval.sh
index 7f364c8..6dc4245 100644
--- a/ci/jjb/shell/bluval.sh
+++ b/ci/jjb/shell/bluval.sh
@@ -10,14 +10,14 @@ git clone "https://gerrit.akraino.org/r/icn" ${WORKSPACE}/icn
 echo "[ICN] Bringing up test cluster"
 function clean_vm {
     pushd ${WORKSPACE}/icn
-    vagrant destroy -f
+    ./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
@@ -51,8 +51,26 @@ EOF
 echo "[ICN] Downloading run_bluval.sh from upstream ci-management"
 wget --read-timeout=10 --timeout=10 --waitretry=10 -t 10 https://raw.githubusercontent.com/akraino-edge-stack/ci-management/master/jjb/shell/run_bluval.sh
 
-echo "[ICN] Patching run_bluval.sh so it doesn't delete .netrc"
-sed -i "s/rm -f ~\/.netrc/#rm -f ~\/.netrc/" run_bluval.sh
+echo "[ICN] Patching run_bluval.sh"
+cat <<'EOF' | patch -p3
+diff --git a/jjb/shell/run_bluval.sh b/jjb/shell/run_bluval.sh
+index 75d20eb..dbfad03 100755
+--- a/jjb/shell/run_bluval.sh
++++ b/jjb/shell/run_bluval.sh
+@@ -177,6 +177,7 @@ if [ "$pull" == "true" ] || [ "$PULL" == "yes" ]
+ then
+     options+=" -P"
+ fi
++options+=" -t amd64-latest"
+
+ set +e
+ if python3 --version > /dev/null; then
+@@ -209,4 +210,3 @@ else
+     rm results.zip
+ fi
+
+-rm -f ~/.netrc
+EOF
 
 echo "[ICN] Executing run_bluval.sh"
 /bin/bash run_bluval.sh