From 117d3c4991b412a0756daadeee0a68edb0c4cf26 Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Wed, 18 Oct 2017 14:07:46 +0000
Subject: [PATCH] Update the dpdk version to 17.08

Change-Id: Idcf705d40f45c10c3c4dee694a80202d576b8026
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---
 bootstrap-verify-perf-DPDK.sh                              | 8 ++++----
 docs/report/vpp_performance_tests/test_environment.rst     | 2 +-
 resources/tools/testbed-setup/playbooks/01-host-setup.yaml | 2 ++
 tests/dpdk/dpdk_scripts/cleanup_dpdk.sh                    | 2 +-
 tests/dpdk/dpdk_scripts/init_dpdk.sh                       | 2 +-
 tests/dpdk/dpdk_scripts/install_dpdk.sh                    | 2 +-
 tests/dpdk/dpdk_scripts/run_l2fwd.sh                       | 2 +-
 tests/dpdk/dpdk_scripts/run_l3fwd.sh                       | 2 +-
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/bootstrap-verify-perf-DPDK.sh b/bootstrap-verify-perf-DPDK.sh
index 1b8a885258..10989fbd9b 100755
--- a/bootstrap-verify-perf-DPDK.sh
+++ b/bootstrap-verify-perf-DPDK.sh
@@ -24,7 +24,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # Reservation dir
 RESERVATION_DIR="/tmp/reservation_dir"
 
-PYBOT_ARGS="-W 150"
+PYBOT_ARGS=""
 
 ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml)
 
@@ -83,7 +83,7 @@ case "$TEST_TAG" in
               -s "tests.dpdk.perf" \
               --exclude SKIP_PATCH \
               -i NDRPDRDISC \
-              tests/dpdk/
+              tests/
         RETURN_STATUS=$(echo $?)
         ;;
     PERFTEST_SHORT )
@@ -93,7 +93,7 @@ case "$TEST_TAG" in
               -v DPDK_TEST:True \
               -s "tests.dpdk.perf" \
               -i NDRCHK \
-              tests/dpdk/
+              tests/
         RETURN_STATUS=$(echo $?)
         ;;
    PERFTEST_NIGHTLY )
@@ -103,7 +103,7 @@ case "$TEST_TAG" in
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
               -v DPDK_TEST:True \
               -s "tests.dpdk.perf" \
-              tests/dpdk/
+              tests/
         RETURN_STATUS=$(echo $?)
         ;;
     * )
diff --git a/docs/report/vpp_performance_tests/test_environment.rst b/docs/report/vpp_performance_tests/test_environment.rst
index 494799ffaf..705f98f7ca 100644
--- a/docs/report/vpp_performance_tests/test_environment.rst
+++ b/docs/report/vpp_performance_tests/test_environment.rst
@@ -2138,7 +2138,7 @@ TG Configuration - TRex
 
 **DPDK version**
 
-DPDK v17.05
+DPDK v17.08
 
 **TG Build Script used**
 
diff --git a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml
index a9e9989cfe..7333885127 100644
--- a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml
+++ b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml
@@ -103,6 +103,8 @@
     copy: src=files/requirements.txt dest=/tmp/requirements.txt
   - name: Install PIP requirements
     pip: requirements=/tmp/requirements.txt
+  - name: Install libnuma-dev
+    apt: name=libnuma-dev state=present
   - name: IRQ pinning
     lineinfile:
         dest: /etc/rc.local
diff --git a/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh b/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
index 48e1a29b63..e1e0ef5331 100755
--- a/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
+++ b/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
@@ -3,7 +3,7 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.05
+DPDK_VERSION=dpdk-17.08
 ROOTDIR=/tmp/openvpp-testing
 TESTPMDLOG=screenlog.0
 PWDDIR=$(pwd)
diff --git a/tests/dpdk/dpdk_scripts/init_dpdk.sh b/tests/dpdk/dpdk_scripts/init_dpdk.sh
index bc4870e73e..d8432d8e52 100755
--- a/tests/dpdk/dpdk_scripts/init_dpdk.sh
+++ b/tests/dpdk/dpdk_scripts/init_dpdk.sh
@@ -3,7 +3,7 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.05
+DPDK_VERSION=dpdk-17.08
 ROOTDIR=/tmp/openvpp-testing
 PWDDIR=$(pwd)
 cd ${ROOTDIR}/${DPDK_VERSION}/
diff --git a/tests/dpdk/dpdk_scripts/install_dpdk.sh b/tests/dpdk/dpdk_scripts/install_dpdk.sh
index 126e8cafc0..2b50c67dac 100755
--- a/tests/dpdk/dpdk_scripts/install_dpdk.sh
+++ b/tests/dpdk/dpdk_scripts/install_dpdk.sh
@@ -3,7 +3,7 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.05
+DPDK_VERSION=dpdk-17.08
 DPDK_DIR=${DPDK_VERSION}
 DPDK_PACKAGE=${DPDK_DIR}.tar.xz
 ROOTDIR=/tmp/openvpp-testing
diff --git a/tests/dpdk/dpdk_scripts/run_l2fwd.sh b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
index 20c41d6d6f..ec5482704e 100755
--- a/tests/dpdk/dpdk_scripts/run_l2fwd.sh
+++ b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
@@ -3,7 +3,7 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.05
+DPDK_VERSION=dpdk-17.08
 ROOTDIR=/tmp/openvpp-testing
 TESTPMDLOG=screenlog.0
 PWDDIR=$(pwd)
diff --git a/tests/dpdk/dpdk_scripts/run_l3fwd.sh b/tests/dpdk/dpdk_scripts/run_l3fwd.sh
index 3363d71875..ecc8eb6991 100755
--- a/tests/dpdk/dpdk_scripts/run_l3fwd.sh
+++ b/tests/dpdk/dpdk_scripts/run_l3fwd.sh
@@ -3,7 +3,7 @@
 set -x
 
 # Setting variables
-DPDK_VERSION=dpdk-17.05
+DPDK_VERSION=dpdk-17.08
 ROOTDIR=/tmp/openvpp-testing
 L3FWDLOG=screenlog.0
 PWDDIR=$(pwd)
-- 
2.16.6