c

Signed-off-by: Sergey V. Lobanov <[email protected]>
svlobanov · May 28, 2024 · 0f316d7 · 0f316d7
1 parent bf7b43e
commit 0f316d7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/.github/workflows/build-and-run.yml b/.github/workflows/build-and-run.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   Build-in-VM:
-    #if: ${{ false }} # disable for now
+    if: ${{ false }} # disable for now
     strategy:
       fail-fast: false
       matrix:
@@ -79,7 +79,7 @@ jobs:
 
   # Debian based distros
   Build-in-Container-Debian:
-    #if: ${{ false }} # disable for now
+    if: ${{ false }} # disable for now
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   Test-in-Qemu:
-    #if: ${{ false }} # disable for now
+    if: ${{ false }} # disable for now
     runs-on: ubuntu-24.04
     name: Test in Qemu (${{ matrix.distro }})
     strategy:
@@ -203,7 +203,7 @@ jobs:
           NEEDRESTART_SUSPEND=1 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true sudo -E apt -y install
           git build-essential cmake gcc linux-headers-`uname -r`
           libpcre3-dev libssl-dev liblua5.1-0-dev kmod python3-pip 
-          iproute2 ppp pppoe isc-dhcp-client
+          iproute2 ppp pppoe isc-dhcp-client dkms debhelper
 
       - name: Install testing tools (using pip)
         run: >
@@ -217,22 +217,34 @@ jobs:
       - name: mkdir build
         run: mkdir build
 
-      - name: cmake
+      - name: cmake (without drivers)
         working-directory: ./build
         run: >
-          cmake -DBUILD_IPOE_DRIVER=TRUE -DBUILD_VLAN_MON_DRIVER=TRUE -DCMAKE_INSTALL_PREFIX=/usr 
+          cmake -DBUILD_IPOE_DRIVER=FALSE -DBUILD_VLAN_MON_DRIVER=FALSE -DCMAKE_INSTALL_PREFIX=/usr 
           -DKDIR=/usr/src/linux-headers-`uname -r` 
           -DLUA=TRUE -DSHAPER=TRUE -DRADIUS=TRUE ..
 
-      - name: make && make install
+      - name: make && make install (without drivers)
         working-directory: ./build
         run: make && sudo make install
 
+      - name: build dkms package for ipoe
+        working-directory: ./drivers/ipoe
+        run: dkms mkdeb --source-only
+
+      - name: build dkms package for vlan_mon
+        working-directory: ./drivers/vlan_mon
+        run: dkms mkdeb --source-only
+
+      - name: install ipoe and vlan_mon via dkms
+        working-directory: ./drivers
+        run: apt -y install *.deb
+
       - name: Insert and check kernel modules (ipoe and vlan-mon)
         # if: ${{ false }}
         run: |
-          sudo insmod build/drivers/vlan_mon/driver/vlan_mon.ko
-          sudo insmod build/drivers/ipoe/driver/ipoe.ko
+          sudo modprobe vlan_mon
+          sudo modprobe ipoe
           lsmod | grep ipoe
           lsmod | grep vlan_mon
 
@@ -242,7 +254,7 @@ jobs:
         run: sudo python3 -m pytest -Wall -v
 
   Test-in-GH-Coverage:
-    #if: ${{ false }} # disable for now
+    if: ${{ false }} # disable for now
     strategy:
       fail-fast: false
       matrix: