X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=dpdk-tests%2Fdpdk_scripts%2Fcleanup_dpdk.sh;h=505a157d13c3d62a32e74da45bf9886e39c4ffe6;hp=3533a1a580aadd268bca4c6c14c9ff16a651f570;hb=383e197b63457b070da297474278f9848b6f1403;hpb=ec059708c78fe3563bc89507739a2712adc062f3

diff --git a/dpdk-tests/dpdk_scripts/cleanup_dpdk.sh b/dpdk-tests/dpdk_scripts/cleanup_dpdk.sh
index 3533a1a580..505a157d13 100755
--- a/dpdk-tests/dpdk_scripts/cleanup_dpdk.sh
+++ b/dpdk-tests/dpdk_scripts/cleanup_dpdk.sh
@@ -3,7 +3,7 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.02
+DPDK_VERSION=dpdk-17.05
 ROOTDIR=/tmp/openvpp-testing
 TESTPMDLOG=screenlog.0
 PWDDIR=$(pwd)
@@ -47,9 +47,9 @@ sudo rm -f /dev/hugepages/*
 # Unbind interfaces
 cd ${ROOTDIR}/${DPDK_VERSION}/
 sudo ./usertools/dpdk-devbind.py -b ${port1_driver} ${port1_pci} || \
-    echo "Unbind ${port1_pci} failed" || exit 1
+    { echo "Unbind ${port1_pci} failed"; exit 1; }
 sudo ./usertools/dpdk-devbind.py -b ${port2_driver} ${port2_pci} || \
-    echo "Unbind ${port1_pci} failed" || exit 1
+    { echo "Unbind ${port1_pci} failed"; exit 1; }
 
 sleep 2
 
@@ -58,6 +58,6 @@ if2_name=`./usertools/dpdk-devbind.py --s | grep "${port2_pci}" | sed -n 's/.*if
 
 # Remove igb_uio driver
 rmmod igb_uio || \
-    echo "Removing igb_uio failed" || exit 1
+    { echo "Removing igb_uio failed"; exit 1; }
 
 cd ${PWDDIR}