From e7b51b38fe7a9d3c4d3eeaadf4c73be691ea980d Mon Sep 17 00:00:00 2001
From: Eelco Chaudron <echaudro@redhat.com>
Date: Tue, 19 Dec 2023 13:42:27 +0100
Subject: [PATCH] ci: Add make check-kernel to GitHub actions ci.

This patch adds 'make check-kernel' to the GitHub actions ci.
However, to do this, some additional changes were needed. First,
some of the missing test and package dependencies had to be added.
Finally, we added an option to the GitHub run matrix that allows
the tests to be split up, to avoid lengthy single test runs.

Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Acked-by: Simon Horman <horms@ovn.org>
---
 .ci/linux-build.sh                   |  3 ++-
 .github/workflows/build-and-test.yml | 11 ++++++++++-
 python/test_requirements.txt         |  4 +++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index bb540703e..05b944ead 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -138,7 +138,8 @@ else
             [ "$(cat /proc/sys/vm/nr_hugepages)" = '1024' ]
             export DPDK_EAL_OPTIONS="--lcores 0@1,1@1,2@1"
         fi
-        $run_as_root make $testsuite TESTSUITEFLAGS=${JOBS} RECHECK=yes
+        $run_as_root make $testsuite TESTSUITEFLAGS="${JOBS} ${TEST_RANGE}" \
+                                     RECHECK=yes
     done
 fi
 
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index acb57ac46..0b881ca91 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -76,7 +76,8 @@ jobs:
     env:
       dependencies: |
         automake libtool gcc bc libjemalloc2 libjemalloc-dev libssl-dev \
-        llvm-dev libnuma-dev libpcap-dev selinux-policy-dev libbpf-dev
+        llvm-dev libnuma-dev libpcap-dev selinux-policy-dev libbpf-dev \
+        lftp libreswan
       ASAN:        ${{ matrix.asan }}
       UBSAN:       ${{ matrix.ubsan }}
       CC:          ${{ matrix.compiler }}
@@ -87,6 +88,7 @@ jobs:
       OPTS:        ${{ matrix.opts }}
       STD:         ${{ matrix.std }}
       TESTSUITE:   ${{ matrix.testsuite }}
+      TEST_RANGE:  ${{ matrix.test_range }}
 
     name: linux ${{ join(matrix.*, ' ') }}
     runs-on: ubuntu-22.04
@@ -167,6 +169,13 @@ jobs:
           - compiler:     gcc
             testsuite:    check-ovsdb-cluster
 
+          - compiler:     gcc
+            testsuite:    check-kernel
+            test_range:   "-100"
+          - compiler:     gcc
+            testsuite:    check-kernel
+            test_range:   "100-"
+
     steps:
     - name: checkout
       uses: actions/checkout@v3
diff --git a/python/test_requirements.txt b/python/test_requirements.txt
index 6aaee13e3..c85ce41ad 100644
--- a/python/test_requirements.txt
+++ b/python/test_requirements.txt
@@ -1,3 +1,5 @@
-pytest
 netaddr
+pyftpdlib
 pyparsing
+pytest
+tftpy