diff options
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build-and-run.yml | 112 | ||||
| -rw-r--r-- | .github/workflows/run-tests.yml | 86 |
2 files changed, 85 insertions, 113 deletions
diff --git a/.github/workflows/build-and-run.yml b/.github/workflows/build-and-run.yml index 6edc531d..fb6dd798 100644 --- a/.github/workflows/build-and-run.yml +++ b/.github/workflows/build-and-run.yml @@ -28,17 +28,15 @@ jobs: - name: Set common vars run: | echo UNAME_R=`uname -r` >> $GITHUB_ENV - echo UNAME_M=`uname -m` >> $GITHUB_ENV - echo NEEDRESTART_SUSPEND=1 >> $GITHUB_ENV - echo DEBIAN_FRONTEND=noninteractive >> $GITHUB_ENV - echo DEBCONF_NONINTERACTIVE_SEEN=true >> $GITHUB_ENV + echo UNAME_M=`uname -m` >> $GITHUB_ENV; - name: Install build tools run: > - sudo apt update && sudo -E apt -y install + sudo apt update && + 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 - name: Check out repository code - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: mkdir build @@ -63,7 +61,7 @@ jobs: accel-ppp_`git describe --tags --long | sed 's/^v//' | sed 's/-/+/' | sed 's/-/~/'`-1+${{ matrix.pkg-distro }}_`uname -m`.deb - name: Install debian package working-directory: ./build - run: sudo -E apt -y install ./accel-ppp*.deb + run: NEEDRESTART_SUSPEND=1 sudo -E apt -y install ./accel-ppp*.deb - name: Copy default config run: sudo cp /etc/accel-ppp.conf.dist /etc/accel-ppp.conf - name: Start accel-ppp @@ -72,6 +70,12 @@ jobs: run: sudo systemctl status accel-ppp - name: Check accel-ppp stat run: accel-cmd show stat + - name: Upload .deb package as artifact + uses: actions/upload-artifact@v4 + with: + name: deb-package-${{ matrix.distro }}-${{ env.UNAME_M }}-${{ env.UNAME_R }} + path: build/accel-ppp_*.deb + if-no-files-found: error # Debian based distros Build-in-Container-Debian: @@ -86,9 +90,9 @@ jobs: "debian:trixie", "ubuntu:20.04", "ubuntu:22.04", - "ubuntu:24.04", + "ubuntu:24.04" ] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 container: image: ${{ matrix.distro }} steps: @@ -108,25 +112,20 @@ jobs: echo DISTRO=$DISTRO >> $GITHUB_ENV; echo CPACK_TYPE=$CPACK_TYPE >> $GITHUB_ENV; echo UNAME_M=`uname -m` >> $GITHUB_ENV; - echo NEEDRESTART_SUSPEND=1 >> $GITHUB_ENV; - echo DEBIAN_FRONTEND=noninteractive >> $GITHUB_ENV; - echo DEBCONF_NONINTERACTIVE_SEEN=true >> $GITHUB_ENV; cat $GITHUB_ENV - name: Install build tools run: > apt update && apt -y upgrade && apt -y dist-upgrade && - apt -y install git build-essential cmake gcc + NEEDRESTART_SUSPEND=1 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt -y install git build-essential cmake gcc linux-headers-${{ env.HEADERS_SUFFIX }} - libpcre3-dev libssl-dev liblua5.1-0-dev kmod dkms debhelper devscripts - - name: Install additional build tools (using apt) (for some OS) - run: apt -y install dh-dkms || exit 0 + libpcre3-dev libssl-dev liblua5.1-0-dev kmod - name: Get kernel name from headers run: > echo KERNEL_NAME=`ls -1 /usr/src/ | grep 'linux-headers.*${{ env.HEADERS_SUFFIX }}' | sed 's/linux-headers-//'` >> $GITHUB_ENV; cat $GITHUB_ENV - name: Check out repository code - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: mkdir build @@ -136,7 +135,7 @@ jobs: - name: cmake working-directory: ./build run: > - cmake -DBUILD_IPOE_DRIVER=FALSE -DBUILD_VLAN_MON_DRIVER=FALSE -DCMAKE_INSTALL_PREFIX=/usr + cmake -DBUILD_IPOE_DRIVER=TRUE -DBUILD_VLAN_MON_DRIVER=TRUE -DCMAKE_INSTALL_PREFIX=/usr -DKDIR=/usr/src/linux-headers-${{ env.KERNEL_NAME }} -DMODULES_KDIR=${{ env.KERNEL_NAME }} -DLUA=TRUE -DSHAPER=FALSE -DRADIUS=TRUE @@ -144,7 +143,7 @@ jobs: - name: make working-directory: ./build run: make - - name: Generate debian package (without drivers) + - name: Generate debian package working-directory: ./build run: cpack -G DEB - name: Rename accel-ppp deb package @@ -152,22 +151,6 @@ jobs: run: > mv -v accel-ppp.deb accel-ppp_`git describe --tags --long | sed 's/^v//' | sed 's/-/+/' | sed 's/-/~/'`-1+${{ env.DISTRO }}_${{ env.UNAME_M }}.deb - - name: build dkms package for ipoe - working-directory: ./drivers/dkms/ipoe - run: | - cp -f ../../../build/version.h src/ - debuild -us -uc -tc -b - - name: build dkms package for vlan_mon - working-directory: ./drivers/dkms/vlan_mon - run: | - cp -f ../../../build/version.h src/ - debuild -us -uc -tc -b - - name: install ipoe and vlan_mon via dkms - working-directory: ./drivers/dkms - run: apt -y install ./*.deb - - name: install ipoe and vlan_mon via dkms - working-directory: ./drivers/dkms - run: apt -y install ./*.deb - name: Install debian package working-directory: ./build run: apt -y install ./accel-ppp*.deb @@ -177,18 +160,60 @@ jobs: run: sleep 1 - name: Check accel-ppp stat run: accel-cmd show stat - - name: Upload accel-ppp .deb package as artifact + - name: Upload .deb package as artifact uses: actions/upload-artifact@v4 with: - name: deb-accel-ppp-${{ env.DISTRO }}-${{ env.UNAME_M }} + name: deb-package-${{ env.DISTRO }}-${{ env.UNAME_M }}-${{ env.KERNEL_NAME }} path: build/accel-ppp_*.deb if-no-files-found: error - - name: Upload driver .deb packages as artifact - uses: actions/upload-artifact@v4 + + Build-in-Container-Mainline: + if: ${{ false }} # disable for now + runs-on: ubuntu-latest + container: + image: ubuntu:devel + steps: + - name: Install build tools + run: > + apt update && apt -y upgrade && apt -y dist-upgrade && + DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt -y install git build-essential cmake gcc + linux-headers-generic libpcre3-dev libssl-dev liblua5.1-0-dev kmod software-properties-common + pkexec dbus linux-base && + add-apt-repository -y ppa:cappelikan/ppa && apt update && + service dbus start && + apt -y install mainline && + mainline --include-rc install-latest && + apt -y purge linux-headers-generic && apt -y autoremove + - name: Get kernel name from headers + run: > + echo KERNEL_NAME=`ls -1 /usr/src/ | grep 'linux-headers.*generic' | + sed 's/linux-headers-//'` >> $GITHUB_ENV; + cat $GITHUB_ENV + - name: Check out repository code + uses: actions/checkout@v3 with: - name: deb-accel-ppp-drivers-dkms-${{ env.DISTRO }} - path: drivers/dkms/accel-ppp*.deb - if-no-files-found: error + fetch-depth: 0 + - name: mkdir build + run: mkdir build + - name: Disable git security warnings + run: git config --global --add safe.directory '*' + - name: cmake + working-directory: ./build + run: > + cmake -DBUILD_IPOE_DRIVER=TRUE -DBUILD_VLAN_MON_DRIVER=TRUE -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_SYSCONFDIR=/etc + -DKDIR=/usr/src/linux-headers-${{ env.KERNEL_NAME }} + -DMODULES_KDIR=${{ env.KERNEL_NAME }} + -DLUA=TRUE -DSHAPER=FALSE -DRADIUS=TRUE .. + - name: make and install + working-directory: ./build + run: make && make install + - name: Start accel-ppp with default config + run: accel-pppd -d -c /etc/accel-ppp.conf.dist + - name: Sleep for 1 sec + run: sleep 1 + - name: Check accel-ppp stat + run: accel-cmd show stat Build-in-Container-Alpine: runs-on: ubuntu-24.04 @@ -199,7 +224,7 @@ jobs: run: > apk update && apk add --no-cache git cmake make g++ pcre-dev libressl-dev linux-headers libucontext-dev lua5.1-dev - name: Check out repository code - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: mkdir build @@ -223,3 +248,4 @@ jobs: run: sleep 1 - name: Check accel-ppp stat run: accel-cmd show stat +
\ No newline at end of file diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2e5e9cf7..3f8016a8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,7 +10,7 @@ on: jobs: Test-in-Qemu: #if: ${{ false }} # disable for now - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 name: Test in Qemu (${{ matrix.distro }}) strategy: fail-fast: false @@ -52,15 +52,10 @@ jobs: with: fetch-depth: 0 path: "accel-ppp" - - name: Set common vars - run: | - echo NEEDRESTART_SUSPEND=1 >> $GITHUB_ENV - echo DEBIAN_FRONTEND=noninteractive >> $GITHUB_ENV - echo DEBCONF_NONINTERACTIVE_SEEN=true >> $GITHUB_ENV - name: Install qemu and required tools run: > sudo apt update && - sudo -E apt -y install qemu-system-x86 qemu-utils cloud-image-utils cpu-checker cloud-image-utils wget openssh-client screen + NEEDRESTART_SUSPEND=1 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true sudo -E apt -y install qemu-system-x86 qemu-utils cloud-image-utils cpu-checker cloud-image-utils wget openssh-client screen - name: Check kvm support (fail is ok) run: sudo kvm-ok || exit 0 - name: Prepare cloud-init image disk @@ -96,9 +91,9 @@ jobs: wget -nv ${{ matrix.image }} -O img/image qemu-img resize -f ${{ matrix.format }} img/`ls -1 img` +2G - name: Run target OS first time (for cloud-init actions) - run: sudo qemu-system-x86_64 -m 3072 -nographic -drive format=${{ matrix.format }},file=img/`ls -1 img` -drive format=raw,file=init.img + run: sudo qemu-system-x86_64 -m 4096 -nographic -drive format=${{ matrix.format }},file=img/`ls -1 img` -drive format=raw,file=init.img - name: Run target OS - run: sudo screen -dmS qemu qemu-system-x86_64 -net nic -net user,hostfwd=tcp::2222-:22 -m 3072 -nographic -drive format=${{ matrix.format }},file=img/`ls -1 img` + run: sudo screen -dmS qemu qemu-system-x86_64 -net nic -net user,hostfwd=tcp::2222-:22 -m 4096 -nographic -drive format=${{ matrix.format }},file=img/`ls -1 img` - name: Check that target OS is running run: | sleep 1 @@ -124,11 +119,8 @@ jobs: git build-essential cmake gcc linux-headers-\`uname -r\` libpcre3-dev libssl-dev liblua5.1-0-dev kmod python3-pip libxml2-dev libxslt1-dev zlib1g-dev - dkms kmod debhelper devscripts iproute2 ppp pppoe isc-dhcp-client timelimit && (sudo pip3 install pytest pytest-dependency || sudo pip3 install --break-system-packages pytest pytest-dependency)" - - name: Install additional build tools (using apt) (for some OS) - run: ssh -i ssh-key -p2222 user@localhost "sudo -E apt -y install dh-dkms || exit 0" - name: Copy source code to target OS run: | tar -Jcf accel-ppp.tar.xz accel-ppp @@ -138,28 +130,11 @@ jobs: run: > ssh -i ssh-key -p2222 user@localhost "cd accel-ppp && mkdir build && cd build && - cmake -DBUILD_IPOE_DRIVER=FALSE -DBUILD_VLAN_MON_DRIVER=FALSE -DCMAKE_INSTALL_PREFIX=/usr + cmake -DBUILD_IPOE_DRIVER=TRUE -DBUILD_VLAN_MON_DRIVER=TRUE -DCMAKE_INSTALL_PREFIX=/usr -DKDIR=/usr/src/linux-headers-\`uname -r\` -DLUA=TRUE -DSHAPER=TRUE -DRADIUS=TRUE .. && make && sudo make install" - - name: build dkms package for ipoe - run: > - ssh -i ssh-key -p2222 user@localhost "cd accel-ppp/drivers/dkms/ipoe && - cp -f ../../../build/version.h src/ && - debuild -us -uc -tc -b" - - - name: build dkms package for vlan_mon - run: > - ssh -i ssh-key -p2222 user@localhost "cd accel-ppp/drivers/dkms/vlan_mon && - cp -f ../../../build/version.h src/ && - debuild -us -uc -tc -b" - - - name: install ipoe and vlan_mon via dkms - run: > - ssh -i ssh-key -p2222 user@localhost "cd accel-ppp/drivers/dkms && - sudo -E apt -y install ./*.deb" - - name: Run tests (not related to ipoe and vlan_mon drivers) timeout-minutes: 5 run: > @@ -174,7 +149,7 @@ jobs: - name: Insert ipoe kernel module run: > ssh -i ssh-key -p2222 user@localhost "cd accel-ppp && - sudo modprobe ipoe && + sudo insmod build/drivers/ipoe/driver/ipoe.ko && lsmod | grep ipoe " - name: Run tests (not related to vlan_mon drivers) @@ -192,7 +167,7 @@ jobs: - name: Insert vlan_mon kernel module run: > ssh -i ssh-key -p2222 user@localhost "cd accel-ppp && - sudo modprobe vlan_mon && + sudo insmod build/drivers/vlan_mon/driver/vlan_mon.ko && lsmod | grep vlan_mon" - name: Run tests (all) @@ -215,21 +190,13 @@ jobs: runs-on: ${{ matrix.distro }} steps: - - name: Set common vars - run: | - echo NEEDRESTART_SUSPEND=1 >> $GITHUB_ENV - echo DEBIAN_FRONTEND=noninteractive >> $GITHUB_ENV - echo DEBCONF_NONINTERACTIVE_SEEN=true >> $GITHUB_ENV - name: Install build tools (using apt) run: > sudo apt update && - sudo -E apt -y install + 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 dkms debhelper devscripts - - - name: Install additional build tools (using apt) (for some OS) - run: sudo -E apt -y install dh-dkms || exit 0 + iproute2 ppp pppoe isc-dhcp-client - name: Install testing tools (using pip) run: > @@ -243,38 +210,22 @@ jobs: - name: mkdir build run: mkdir build - - name: cmake (without drivers) + - name: cmake working-directory: ./build run: > - cmake -DBUILD_IPOE_DRIVER=FALSE -DBUILD_VLAN_MON_DRIVER=FALSE -DCMAKE_INSTALL_PREFIX=/usr + cmake -DBUILD_IPOE_DRIVER=TRUE -DBUILD_VLAN_MON_DRIVER=TRUE -DCMAKE_INSTALL_PREFIX=/usr -DKDIR=/usr/src/linux-headers-`uname -r` -DLUA=TRUE -DSHAPER=TRUE -DRADIUS=TRUE .. - - name: make && make install (without drivers) + - name: make && make install working-directory: ./build run: make && sudo make install - - name: build dkms package for ipoe - working-directory: ./drivers/dkms/ipoe - run: | - cp -f ../../../build/version.h src/ - debuild -us -uc -tc -b - - - name: build dkms package for vlan_mon - working-directory: ./drivers/dkms/vlan_mon - run: | - cp -f ../../../build/version.h src/ - debuild -us -uc -tc -b - - - name: install ipoe and vlan_mon via dkms - working-directory: ./drivers/dkms - run: sudo -E apt -y install ./*.deb - - name: Insert and check kernel modules (ipoe and vlan-mon) # if: ${{ false }} run: | - sudo modprobe vlan_mon - sudo modprobe ipoe + sudo insmod build/drivers/vlan_mon/driver/vlan_mon.ko + sudo insmod build/drivers/ipoe/driver/ipoe.ko lsmod | grep ipoe lsmod | grep vlan_mon @@ -288,19 +239,14 @@ jobs: strategy: fail-fast: false matrix: - distro: ["ubuntu-24.04"] + distro: ["ubuntu-24.04", "ubuntu-22.04", "ubuntu-20.04"] runs-on: ${{ matrix.distro }} steps: - - name: Set common vars - run: | - echo NEEDRESTART_SUSPEND=1 >> $GITHUB_ENV - echo DEBIAN_FRONTEND=noninteractive >> $GITHUB_ENV - echo DEBCONF_NONINTERACTIVE_SEEN=true >> $GITHUB_ENV - name: Install build tools (using apt) run: > sudo apt update && - sudo -E apt -y install + 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 |