Skip to content

Commit

Permalink
travis: Don't install kernel for DPDK checks.
Browse files Browse the repository at this point in the history
Change-Id: I7815389a93848fce857fed05fe034c47fdca8431
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
  • Loading branch information
igsilya committed May 21, 2019
1 parent 4fc75ae commit a1dd91b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 22 deletions.
24 changes: 4 additions & 20 deletions .travis.yml
Expand Up @@ -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:
Expand Down
9 changes: 7 additions & 2 deletions .travis/linux-build.sh
Expand Up @@ -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)"
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit a1dd91b

Please sign in to comment.