diff options
| author | Greg Rose <gvrose8192@gmail.com> | 2022-07-14 14:23:26 -0700 |
|---|---|---|
| committer | Ilya Maximets <i.maximets@ovn.org> | 2022-07-15 13:45:55 +0200 |
| commit | b6941ca7b8c943d78f3d1f4016068e2041701904 (patch) | |
| tree | 4abc3e6fed344f2a0116c448613fec2187614466 | |
| parent | 16bec677aab8482a0fc9e26a4356fb5cce502e5a (diff) | |
| download | openvswitch-b6941ca7b8c943d78f3d1f4016068e2041701904.tar.gz | |
ci: Stop building OVS kernel module.
Remove kernel based github workflows since the OVS kernel driver is
no longer supported since Release 2.18
Co-authored-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
| -rwxr-xr-x | .ci/linux-build.sh | 33 | ||||
| -rw-r--r-- | .github/workflows/build-and-test.yml | 14 |
2 files changed, 3 insertions, 44 deletions
diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index b7d93f36b..c396ec1e8 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -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 @@ -270,8 +257,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. @@ -282,20 +268,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 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 4c84b3a96..66b226ce4 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -16,7 +16,6 @@ jobs: 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 }} @@ -37,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 @@ -69,16 +65,6 @@ jobs: 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 - compiler: clang |