From 3de5f5e12d04f586e952ac9e8df1565b6fb807a7 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Wed, 17 May 2023 10:24:28 +0000
Subject: [PATCH] ci: add kernel module tests to e2e matrix

---
 .github/workflows/debian-cache.yml       |  6 +++---
 .github/workflows/images-debian.yml      |  4 ++--
 .github/workflows/images-oraclelinux.yml |  4 ++--
 .github/workflows/macos.yml              |  4 ++--
 .github/workflows/ubuntu.yml             | 14 +++++++++-----
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/debian-cache.yml b/.github/workflows/debian-cache.yml
index 7ef1030..3430739 100644
--- a/.github/workflows/debian-cache.yml
+++ b/.github/workflows/debian-cache.yml
@@ -1,4 +1,4 @@
-name: Debian kernels cache
+name: Debian
 
 on:
   workflow_dispatch:
@@ -13,7 +13,7 @@ on:
 
 jobs:
   debian-kernel-metadata-cache:
-    name: Cache Debian kernels metadata
+    name: Cache metadata
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
@@ -44,7 +44,7 @@ jobs:
       run: s3cmd put --acl-public ~/.out-of-tree/debian.cache s3://out-of-tree/1.0.0/ --host=fra1.digitaloceanspaces.com --host-bucket='%(bucket)s.fra1.digitaloceanspaces.com' --access_key=${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }} --secret_key=${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
 
   debian-kernel-packages-mirror:
-    name: Mirror Debian kernel packages
+    name: Mirror packages
     needs: debian-kernel-metadata-cache
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/images-debian.yml b/.github/workflows/images-debian.yml
index f5d57d1..cf93332 100644
--- a/.github/workflows/images-debian.yml
+++ b/.github/workflows/images-debian.yml
@@ -1,4 +1,4 @@
-name: Debian images
+name: Debian
 
 on:
   workflow_dispatch:
@@ -9,7 +9,7 @@ on:
 
 jobs:
   images:
-    name: Generate Debian images
+    name: Qemu Images
     runs-on: ubuntu-latest
     steps:
     - uses: digitalocean/action-doctl@v2
diff --git a/.github/workflows/images-oraclelinux.yml b/.github/workflows/images-oraclelinux.yml
index 0aa650b..c761c35 100644
--- a/.github/workflows/images-oraclelinux.yml
+++ b/.github/workflows/images-oraclelinux.yml
@@ -1,4 +1,4 @@
-name: Oracle Linux images
+name: Oracle Linux
 
 on:
   workflow_dispatch:
@@ -9,7 +9,7 @@ on:
 
 jobs:
   images-oraclelinux:
-    name: Generate Oracle Linux images
+    name: Qemu Images
     runs-on: ubuntu-latest
     steps:
     - uses: digitalocean/action-doctl@v2
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 8671a30..944099b 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -1,4 +1,4 @@
-name: Build on macOS
+name: macOS
 
 on:
   workflow_dispatch:
@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    name: Build on macOS
+    name: Build
     runs-on: macOS-latest
     steps:
     - uses: actions/checkout@v1
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index c4fab04..450922c 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -39,7 +39,7 @@ jobs:
         go test -parallel 1 -v ./...
 
   test-end-to-end-examples:
-    name: E2E Testing (Examples)
+    name: E2E T. Examples
     runs-on: ubuntu-latest
 
     strategy:
@@ -76,13 +76,14 @@ jobs:
         path: /home/runner/.out-of-tree/logs
 
   test-end-to-end:
-    name: E2E Testing
+    name: E2E T.
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
     strategy:
       fail-fast: false
       matrix:
+        type: [ Script, Module ]
         os: [
           { distro: Ubuntu, release: 12.04 },
           { distro: Ubuntu, release: 14.04 },
@@ -115,13 +116,14 @@ jobs:
         sudo apt-get update
         sudo apt-get install qemu-system-x86
 
-    - name: End-to-End Testing [${{ matrix.os.distro }} ${{ matrix.os.release }}]
+    - name: End-to-End Testing ${{ matrix.type }} [${{ matrix.os.distro }} ${{ matrix.os.release }}]
+      shell: bash
       run: |
         mkdir test
         cd test
 
-        echo 'name = "out-of-tree script"' >> .out-of-tree.toml
-        echo 'type = "script"' >> .out-of-tree.toml
+        echo 'name = "test >> .out-of-tree.toml
+        echo 'type = "${{ matrix.type }}"' >> .out-of-tree.toml
         echo 'script = "script.sh"' >> .out-of-tree.toml
         echo '[[supported_kernels]]' >> .out-of-tree.toml
         echo 'distro_type = "${{ matrix.os.distro }}"' >> .out-of-tree.toml
@@ -130,6 +132,8 @@ jobs:
 
         echo -e '#!/bin/sh\necho ok' >> script.sh
 
+        cp ../examples/kernel-module/{module.c,Makefile,test.sh} .
+
         ../out-of-tree --log-level=debug kernel list-remote --distro=${{ matrix.os.distro }} --ver=${{ matrix.os.release }}
         ../out-of-tree --log-level=debug kernel autogen --max=1 --shuffle
         ../out-of-tree --log-level=debug pew --qemu-timeout=10m