@@ -91,9 +91,6 @@ function install_kernel()
sudo sed -i '/^# define __always_inline .*/i # undef __always_inline' \
/usr/include/x86_64-linux-gnu/sys/cdefs.h || true
EXTRA_OPTS="${EXTRA_OPTS} --enable-afxdp"
- else
- EXTRA_OPTS="${EXTRA_OPTS} --with-linux=$(pwd)"
- echo "Installed kernel source in $(pwd)"
fi
popd
}
@@ -187,20 +184,10 @@ function configure_ovs()
function build_ovs()
{
- local KERNEL=$1
-
configure_ovs $OPTS
make selinux-policy
- # Only build datapath if we are testing kernel w/o running testsuite and
- # AF_XDP support.
- if [ "${KERNEL}" ] && ! [ "$AFXDP" ]; then
- pushd datapath
- make -j4
- popd
- else
- make -j4
- fi
+ make -j4
}
if [ "$DEB_PACKAGE" ]; then
@@ -256,8 +243,7 @@ if [ "$UBSAN" ]; then
CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} ${CFLAGS_UBSAN}"
fi
-save_OPTS="${OPTS} $*"
-OPTS="${EXTRA_OPTS} ${save_OPTS}"
+OPTS="${EXTRA_OPTS} ${OPTS} $*"
if [ "$TESTSUITE" ]; then
# 'distcheck' will reconfigure with required options.
@@ -268,20 +254,7 @@ if [ "$TESTSUITE" ]; then
make distcheck -j4 CFLAGS="${CFLAGS_FOR_OVS}" \
TESTSUITEFLAGS=-j4 RECHECK=yes
else
- if [ -z "${KERNEL_LIST}" ]; then build_ovs ${KERNEL};
- else
- save_EXTRA_OPTS="${EXTRA_OPTS}"
- for KERNEL in ${KERNEL_LIST}; do
- echo "=============================="
- echo "Building with kernel ${KERNEL}"
- echo "=============================="
- EXTRA_OPTS="${save_EXTRA_OPTS}"
- install_kernel ${KERNEL}
- OPTS="${EXTRA_OPTS} ${save_OPTS}"
- build_ovs ${KERNEL}
- make distclean
- done
- fi
+ build_ovs
fi
exit 0
@@ -9,17 +9,13 @@ jobs:
automake libtool gcc bc libjemalloc1 libjemalloc-dev \
libssl-dev llvm-dev libelf-dev libnuma-dev libpcap-dev \
ninja-build selinux-policy-dev
- deb_dependencies: |
- linux-headers-$(uname -r) build-essential fakeroot devscripts equivs
AFXDP: ${{ matrix.afxdp }}
ASAN: ${{ matrix.asan }}
UBSAN: ${{ matrix.ubsan }}
CC: ${{ matrix.compiler }}
- DEB_PACKAGE: ${{ matrix.deb_package }}
DPDK: ${{ matrix.dpdk }}
DPDK_SHARED: ${{ matrix.dpdk_shared }}
KERNEL: ${{ matrix.kernel }}
- KERNEL_LIST: ${{ matrix.kernel_list }}
LIBS: ${{ matrix.libs }}
M32: ${{ matrix.m32 }}
OPTS: ${{ matrix.opts }}
@@ -40,14 +36,11 @@ jobs:
- compiler: gcc
testsuite: test
- kernel: 3.16
- compiler: clang
testsuite: test
- kernel: 3.16
asan: asan
- compiler: clang
testsuite: test
- kernel: 3.16
ubsan: ubsan
- compiler: gcc
@@ -71,16 +64,6 @@ jobs:
testsuite: test
libs: -ljemalloc
- - compiler: gcc
- kernel_list: 5.8 5.5 5.4 4.19
- - compiler: clang
- kernel_list: 5.8 5.5 5.4 4.19
-
- - compiler: gcc
- kernel_list: 4.14 4.9 4.4 3.16
- - compiler: clang
- kernel_list: 4.14 4.9 4.4 3.16
-
- compiler: gcc
afxdp: afxdp
kernel: 5.3
@@ -111,9 +94,6 @@ jobs:
m32: m32
opts: --disable-ssl
- - compiler: gcc
- deb_package: deb
-
steps:
- name: checkout
uses: actions/checkout@v2