X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=dpdk-tests%2Fdpdk_scripts%2Finstall_dpdk.sh;h=d011f378efa86a5224e97cfce15cebcf4f25855a;hp=4b4c04a7277429bfed0613add164296432f4ff57;hb=383e197b63457b070da297474278f9848b6f1403;hpb=ec059708c78fe3563bc89507739a2712adc062f3

diff --git a/dpdk-tests/dpdk_scripts/install_dpdk.sh b/dpdk-tests/dpdk_scripts/install_dpdk.sh
index 4b4c04a727..d011f378ef 100755
--- a/dpdk-tests/dpdk_scripts/install_dpdk.sh
+++ b/dpdk-tests/dpdk_scripts/install_dpdk.sh
@@ -3,7 +3,7 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.02
+DPDK_VERSION=dpdk-17.05
 DPDK_DIR=${DPDK_VERSION}
 DPDK_PACKAGE=${DPDK_DIR}.tar.xz
 ROOTDIR=/tmp/openvpp-testing
@@ -12,14 +12,14 @@ PWDDIR=$(pwd)
 # Download the DPDK package
 cd ${ROOTDIR}
 wget "fast.dpdk.org/rel/${DPDK_PACKAGE}" || \
-    echo "Failed to download $DPDK_PACKAGE" || exit 1
+    { echo "Failed to download $DPDK_PACKAGE"; exit 1; }
 tar xJvf ${DPDK_PACKAGE} || \
-    echo "Failed to extract $DPDK_PACKAGE" || exit 1
+    { echo "Failed to extract $DPDK_PACKAGE"; exit 1; }
 
 # Compile the DPDK
 cd ./${DPDK_DIR}
 make install T=x86_64-native-linuxapp-gcc -j || \
-    echo "Failed to compile $DPDK_VERSION" || exit 1
+    { echo "Failed to compile $DPDK_VERSION"; exit 1; }
 cd ${PWDDIR}
 
 # Compile the l3fwd
@@ -27,7 +27,7 @@ export RTE_SDK=${ROOTDIR}/${DPDK_DIR}/
 export RTE_TARGET=x86_64-native-linuxapp-gcc
 cd ${RTE_SDK}/examples/l3fwd
 make -j || \
-    echo "Failed to compile l3fwd" || exit 1
+    { echo "Failed to compile l3fwd"; exit 1; }
 cd ${PWDDIR}
 
 # Check and setup the hugepages
@@ -49,7 +49,7 @@ if [ ${SYS_HUGEPAGE} -lt 4096 ]; then
     echo "  Mounting hugepages"
     sudo mkdir -p /mnt/huge
     sudo mount -t hugetlbfs nodev /mnt/huge/ || \
-        echo "Failed to mount hugepages" || exit 1
+        { echo "Failed to mount hugepages"; exit 1; }
 fi
 
 # Check and set the max map count