Merge pull request #77 from lool/matrix-kernel-builds

Build and test images for various kernels

Author: lool

.github/workflows/debos.yml

@@ -2,6 +2,20 @@ name: Build debos recipe
 
 on:
   workflow_call:
+    inputs:
+      mainline_kernel:
+        description: Whether to use a mainline kernel deb
+        type: boolean
+        default: false
+      overlays:
+        description: List of overlays to use
+        type: string
+        default: qsc-deb-releases
+      kernelpackage:
+        description: Name of kernel package to use
+        type: string
+        default: linux-image-6.16.0-rc3-qcom1
+
     outputs:
       artifacts_url:
         description: "URL to retrieve build artifacts"
@@ -48,15 +62,17 @@ jobs:
       - name: Copy Linux deb and U-Boot for RB1 from fileserver space for downloads
         run: |
           set -ux
-          mkdir -v debos-recipes/local-debs
           dir="/fileserver-downloads/qcom-deb-images"
-          # copy linux-image but not the -dbg e.g.
-          # linux-image-6.15.0-..._6.15.0...-1_arm64.deb but not
-          # linux-image-6.15.0-...-dbg_6.15.0...-1_arm64.deb
-          find "${dir}/linux-deb-latest/" \
-              -name linux-image\*.deb \
-              -not -name linux-image\*-dbg_\*.deb \
-              -exec cp -av '{}' debos-recipes/local-debs/ \;
+          if [ "${{ inputs.mainline_kernel }}" = true ]; then
+              mkdir -v debos-recipes/local-debs
+              # copy linux-image but not the -dbg e.g.
+              # linux-image-6.15.0-..._6.15.0...-1_arm64.deb but not
+              # linux-image-6.15.0-...-dbg_6.15.0...-1_arm64.deb
+              find "${dir}/linux-deb-latest/" \
+                  -name linux-image\*.deb \
+                  -not -name linux-image\*-dbg_\*.deb \
+                  -exec cp -av '{}' debos-recipes/local-debs/ \;
+          fi
           # copy U-Boot RB1 binary
           cp -av "${dir}/u-boot-rb1-latest/rb1-boot.img" .
 
@@ -67,7 +83,17 @@ jobs:
       - name: Build rootfs with debos
         run: |
           set -ux
-          debos -t xfcedesktop:true -t localdebs:local-debs/ \
+          localdebs=""
+          if [ -d debos-recipes/local-debs ]; then
+              localdebs="-t localdebs:local-debs/"
+          fi
+          debos \
+              -t overlays:'${{ inputs.overlays }}' \
+              -t experimentalkernel:true \
+              -t xfcedesktop:true \
+              ${localdebs} \
+              -t kernelpackage:'${{ inputs.kernelpackage }}' \
+              --print-recipe \
               debos-recipes/qualcomm-linux-debian-rootfs.yaml
 
       - name: Build UFS and SD card images with debos
@@ -80,15 +106,18 @@ jobs:
           # whole build is done from memory and the out of memory killer
           # gets triggered
           debos -b qemu --scratchsize 4GiB -t imagetype:ufs \
+              --print-recipe \
               debos-recipes/qualcomm-linux-debian-image.yaml
           debos -b qemu --scratchsize 4GiB -t imagetype:sdcard \
+              --print-recipe \
               debos-recipes/qualcomm-linux-debian-image.yaml
 
       - name: Build flashable files with debos
         run: |
           set -ux
           debos -t u_boot_rb1:rb1-boot.img \
-                 debos-recipes/qualcomm-linux-debian-flash.yaml
+              --print-recipe \
+              debos-recipes/qualcomm-linux-debian-flash.yaml
 
       - name: Stage debos artifacts for publishing
         run: |

.github/workflows/linux.yml

@@ -1,4 +1,4 @@
-name: Build Linux kernel deb
+name: Build Linux kernel deb and debos image
 
 on:
   # run weekly on Monday at 8:30am
@@ -9,7 +9,10 @@ on:
 
 # implicitely set all other permissions to none
 permissions:
-  contents: read # actions/checkout
+  contents: read # actions/checkout debos.yml test.yml
+  contents: read # debos.yml lava-schema-check.yml test.yml
+  packages: read # test.yml
+  pull-requests: write # test.yml
 
 env:
   # where results will be posted/hosted
@@ -90,3 +93,16 @@ jobs:
         with:
           path: artifacts
 
+  debos-mainline-linux:
+    needs: build-linux-deb
+    uses: ./.github/workflows/debos.yml
+    with:
+      mainline_kernel: true
+
+  test-mainline-linux:
+    uses: ./.github/workflows/test.yml
+    needs: debos-mainline-linux
+    secrets: inherit
+    with:
+      url: ${{ needs.debos-mainline-linux.outputs.artifacts_url }}
+

debos-recipes/overlays/qsc-deb-releases/etc/apt/keyrings/qsc-deb-releases.asc

@@ -0,0 +1,14 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaGwEMxYJKwYBBAHaRw8BAQdAg8Nfdby/c9Y6bctGLnGJrhMhedCGfYzrp9Sa
+RWtQgDe0NXFzY19hcHRfcmVwby0wNzA3MjAyNSA8YXJ0aWZhY3RvcnkuY29yZUBx
+dWFsY29tbS5jb20+iJkEExYKAEEWIQRyQhNJGZOZvf1sqY3IwASzX5SqWwUCaGwE
+MwIbAwUJBaOagAULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRDIwASzX5Sq
+W0k4AQCzVUgf+ydkoHdxKiHzwZjDowL38lAp92zlvQqK2r+9kQEAxZYBhPQ4ZVo9
+RL2bOrJexNAJyYqRamtrU+jkBn1wjQq4OARobAQzEgorBgEEAZdVAQUBAQdASOGZ
+gHVoc7BboK7yCC3bSib9NLBlrsA47RRvT7fPHhoDAQgHiH4EGBYKACYWIQRyQhNJ
+GZOZvf1sqY3IwASzX5SqWwUCaGwEMwIbDAUJBaOagAAKCRDIwASzX5SqWzH3AP94
+HDue14QrgcEsyXCElAAZxYqiDMFu663G3ki0lGB1vAEAz0tqLiapgthdSt/c/2YQ
+tej7g/77RkEpjjhnWiLMiAM=
+=7H+M
+-----END PGP PUBLIC KEY BLOCK-----

debos-recipes/overlays/qsc-deb-releases/etc/apt/sources.list.d/qsc-deb-releases.sources

@@ -0,0 +1,9 @@
+# QArtifactory qsc-deb-releases repository
+# NB: publishing Sources indices for deb-src isn't supported by Artifactory,
+# but sources are published with other packages files
+Types: deb
+URIs: https://qartifactory-edge.qualcomm.com/artifactory/qsc-deb-releases
+Suites: trixie-overlay
+Components: main
+Signed-By: /etc/apt/keyrings/qsc-deb-releases.asc
+Enabled: yes

debos-recipes/qualcomm-linux-debian-rootfs.yaml

@@ -1,6 +1,7 @@
 {{- $xfcedesktop := or .xfcedesktop "false" }}
 {{- $experimentalkernel := or .experimentalkernel "false" }}
 {{- $localdebs := or .localdebs "none" }}
+{{- $kernelpackage := or .kernelpackage "linux-image-arm64" }}
 
 architecture: arm64
 
@@ -24,6 +25,14 @@ actions:
       apt -y modernize-sources
       rm -v /etc/apt/sources.list.bak
 
+{{- if .overlays }}
+{{- range $overlay := split "," .overlays }}
+  - action: overlay
+    description: Apply overlay {{$overlay}}
+    source: overlays/{{$overlay}}
+{{- end }}
+{{- end }}
+
   - action: apt
     description: Install foundational packages
     recommends: true
@@ -175,13 +184,26 @@ actions:
           update-locale LANG=en_US.UTF-8
       fi
 
+  # usually these packages are pulled by Pre-Depends/Depends/Recommends of
+  # Debian's linux-image, but kernel packages generated with the upstream
+  # deb-pkg target don't have these dependencies, so install these before
+  # installing kernels; this is a separate step because of the Pre-Depends
+  - action: apt
+    description: Install kernel dependencies
+    recommends: true
+    packages:
+      - apparmor
+      - initramfs-tools
+      - kmod
+      - linux-base
+
   - action: apt
     description: Install kernel and firmware packages
     recommends: true
     packages:
       - firmware-atheros
       - firmware-qcom-soc
-      - linux-image-arm64
+      - {{$kernelpackage}}
 
   # XXX this is a workaround until firmware-non-free migrates to testing; it
   # might make sense to have a generic mechanism to do this
@@ -198,7 +220,7 @@ actions:
       Components: main non-free-firmware
       Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
       EOF
-      # update and install kernel from experimental
+      # update and install firmware from unstable
       apt update
       apt -y install -t unstable firmware-atheros firmware-qcom-soc
       # remove sid APT sources and update again
@@ -224,7 +246,7 @@ actions:
       EOF
       # update and install kernel from experimental
       apt update
-      apt -y install -t experimental linux-image-arm64
+      apt -y install -t experimental {{$kernelpackage}}
       # disable experimental from APT sources
       sed -i "1s/^/Enabled: no\n/" \
           /etc/apt/sources.list.d/debian-experimental.sources