From a1dd91bd12bccb7c88e074c2c1c43a297b48cf23 Mon Sep 17 00:00:00 2001
From: Ilya Maximets <i.maximets@samsung.com>
Date: Tue, 21 May 2019 16:11:32 +0300
Subject: [PATCH] travis: Don't install kernel for DPDK checks.

Change-Id: I7815389a93848fce857fed05fe034c47fdca8431
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
---
 .travis.yml            | 24 ++++--------------------
 .travis/linux-build.sh |  9 +++++++--
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6621fb53575..d9eec4ca458 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,26 +27,10 @@ before_install: ./.travis/${TRAVIS_OS_NAME}-prepare.sh
 before_script: export PATH=$PATH:$HOME/bin
 
 env:
-  - OPTS="--disable-ssl"
-  - TESTSUITE=1 KERNEL=3.16
-  - TESTSUITE=1 OPTS="--enable-shared"
-  - BUILD_ENV="-m32" OPTS="--disable-ssl"
-  - KERNEL=3.16 DPDK=1 OPTS="--enable-shared"
-  - KERNEL=3.16 TESTSUITE=1 DPDK=1
-  - KERNEL=3.16 DPDK_SHARED=1
-  - KERNEL=3.16 DPDK_SHARED=1 OPTS="--enable-shared"
-  - KERNEL=4.20
-  - KERNEL=4.19
-  - KERNEL=4.18
-  - KERNEL=4.17
-  - KERNEL=4.16
-  - KERNEL=4.15
-  - KERNEL=4.14
-  - KERNEL=4.9
-  - KERNEL=4.4
-  - KERNEL=3.19
-  - KERNEL=3.16
-  - TESTSUITE=1 LIBS=-ljemalloc
+  - DPDK=1 OPTS="--enable-shared"
+  - TESTSUITE=1 DPDK=1
+  - DPDK_SHARED=1
+  - DPDK_SHARED=1 OPTS="--enable-shared"
 
 matrix:
   include:
diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh
index 9c2d97803bd..6e67cc914bc 100755
--- a/.travis/linux-build.sh
+++ b/.travis/linux-build.sh
@@ -86,6 +86,11 @@ function install_dpdk()
         sed -i '/CONFIG_RTE_BUILD_SHARED_LIB=n/s/=n/=y/' config/common_base
         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/$TARGET/lib
     fi
+
+    # Disable building DPDK kernel modules. Not needed for OVS build/tests.
+    sed -i '/CONFIG_RTE_EAL_IGB_UIO=y/s/=y/=n/' config/common_linuxapp
+    sed -i '/CONFIG_RTE_KNI_KMOD=y/s/=y/=n/' config/common_linuxapp
+
     make config CC=gcc T=$TARGET
     make -j4 CC=gcc RTE_KERNELDIR=$KERNELSRC
     echo "Installed DPDK source in $(pwd)"
@@ -97,7 +102,7 @@ function configure_ovs()
     ./boot.sh && ./configure $* || { cat config.log; exit 1; }
 }
 
-if [ "$KERNEL" ] || [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then
+if [ "$KERNEL" ]; then
     install_kernel $KERNEL
 fi
 
@@ -144,7 +149,7 @@ else
     make selinux-policy
 
     # Only build datapath if we are testing kernel w/o running testsuite
-    if [ "$KERNEL" ] && [ ! "$DPDK" ] && [ ! "$DPDK_SHARED" ]; then
+    if [ "$KERNEL" ]; then
         cd datapath
     fi
     make -j4