Merge pull request #350 from gagath/debian-unstable

Multi-series Debian support

Author: lool

.github/workflows/build-daily.yml

@@ -28,3 +28,4 @@ jobs:
     secrets: inherit
     with:
       url: ${{ needs.build-daily.outputs.artifacts_url }}
+      suite: trixie

.github/workflows/build-on-pr.yml

@@ -21,7 +21,20 @@ jobs:
         name: Event File
         path: ${{ github.event_path }}
 
-  build-pr:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        suite: [trixie, forky]
+        kernelpackage: [default-ci, linux-image-arm64]
+        exclude:
+          - suite: trixie
+            kernelpackage: linux-image-arm64
+          - suite: forky
+            kernelpackage: default-ci
     uses: ./.github/workflows/debos.yml
+    with:
+      suite: ${{ matrix.suite }}
+      kernelpackage: ${{ matrix.kernelpackage }}
   schema-check:
     uses: ./.github/workflows/lava-schema-check.yml

.github/workflows/build-on-push.yml

@@ -13,7 +13,20 @@ permissions:
 
 jobs:
   build-daily:
+    strategy:
+      fail-fast: false
+      matrix:
+        suite: [trixie, forky]
+        kernelpackage: [default-ci, linux-image-arm64]
+        exclude:
+          - suite: trixie
+            kernelpackage: linux-image-arm64
+          - suite: forky
+            kernelpackage: default-ci
     uses: ./.github/workflows/debos.yml
+    with:
+      suite: ${{ matrix.suite }}
+      kernelpackage: ${{ matrix.kernelpackage }}
   schema-check:
     uses: ./.github/workflows/lava-schema-check.yml
   test:

.github/workflows/debos.yml

@@ -3,6 +3,10 @@ name: Build debos recipe
 on:
   workflow_call:
     inputs:
+      suite:
+        description: Distribution suite (e.g. trixie, forky)
+        type: string
+        default: trixie
       overlays:
         description: List of overlays to use
         type: string
@@ -13,10 +17,7 @@ on:
           linux-image-arm64) or name of a EFS kernel package directory
           (e.g. efs/mainline)
         type: string
-        # the package name will be passed to APT which interprets the trailing
-        # plus sign in the package name as a request to install the package, so
-        # use two plus signs
-        default: linux-image-6.16.7-qcom1++
+        default: default-ci
       debos_extra_args:
         description: Extra arguments to pass to debos (e.g. -t dtb:qcom/some.dtb)
         type: string
@@ -40,11 +41,12 @@ env:
   # image build id; used for SBOM generation
   BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}
   KERNEL_PACKAGE: ${{ inputs.kernelpackage }}
-  DEBOS_EXTRA_ARGS: ${{ inputs.debos_extra_args }}
+  DEBOS_EXTRA_ARGS: -t suite:${{ inputs.suite }} ${{ inputs.debos_extra_args }}
+  PREFIX: ${{ inputs.suite }}
 
 jobs:
   build-debos:
-    name: Build and upload debos recipes
+    name: Build and upload debos recipes (${{ inputs.suite }})
     outputs:
       url: ${{ steps.upload_artifacts_s3.outputs.url }}
     runs-on: [self-hosted, qcom-u2404, arm64]
@@ -101,11 +103,17 @@ jobs:
         run: |
           set -ux
           kernel_package="$KERNEL_PACKAGE"
-          # if kernel package is from EFS, determine actual package name
           case "$kernel_package" in
+            # if kernel package is from EFS, determine actual package name
             efs/*)
               kernel_package="$(find local-apt-repo/kernel -type f -name 'linux-image-*' -not -name '*dbg*'|xargs -n1 basename|cut -f1 -d_)"
-            ;;
+              ;;
+            default-ci)
+              # the package name will be passed to APT which interprets the trailing
+              # plus sign in the package name as a request to install the package, so
+              # use two plus signs
+              kernel_package="linux-image-6.16.7-qcom1++"
+              ;;
           esac
 
           debos \
@@ -141,13 +149,13 @@ jobs:
           # create a directory for the current run
           dir="debos-artifacts"
           mkdir -v "${dir}"
-          # compress output files into the staging directory
-          gzip -c rootfs.tar >"${dir}/rootfs.tar.gz"
-          gzip -c disk-ufs.img >"${dir}/disk-ufs.img.gz"
-          gzip -c disk-sdcard.img >"${dir}/disk-sdcard.img.gz"
-          cp -av dtbs.tar.gz "${dir}"
+          # compress output files directly into the staging directory
+          gzip -c rootfs.tar >"${dir}/${PREFIX}-rootfs.tar.gz"
+          gzip -c disk-ufs.img >"${dir}/${PREFIX}-disk-ufs.img.gz"
+          gzip -c disk-sdcard.img >"${dir}/${PREFIX}-disk-sdcard.img.gz"
+          cp -av dtbs.tar.gz "${dir}/${PREFIX}-dtbs.tar.gz"
           # create tarballs with support for all UFS and all eMMC boards
-          scripts/bundle-flash-dirs.sh "${dir}"
+          scripts/bundle-flash-dirs.sh "${dir}" "${PREFIX}"
           # generate sha256sums for all artifacts
           (cd "${dir}" && sha256sum * | tee sha256sums.txt)
 
@@ -202,7 +210,7 @@ jobs:
           dir="sboms"
           mkdir -v sboms
           for f in rootfs-sbom.*; do
-              gzip -c "$f" >"${dir}/${f}.gz"
+              gzip -c "$f" >"${dir}/${PREFIX}-${f}.gz"
           done
 
       - name: Upload SBOMs as private artifacts

.github/workflows/lava-test.yml

@@ -6,6 +6,10 @@ on:
       url:
         required: true
         type: string
+      suite:
+        description: Distribution suite (e.g. trixie, forky)
+        type: string
+        default: trixie
 
 # implicitely set all other permissions to none
 permissions:
@@ -17,6 +21,7 @@ permissions:
 env:
   BUILD_URL: ${{ inputs.url }}
   LAVA_CI: ci/lava/
+  SUITE: ${{ inputs.suite }}
 
 jobs:
   prepare-job-list:
@@ -83,6 +88,7 @@ jobs:
               -e "s|{{BUILD_DOWNLOAD_URL}}|${BUILD_DOWNLOAD_URL}|g" \
               -e "s|{{BUILD_FILE_NAME}}|${BUILD_FILE_NAME}|g" \
               -e "s|{{DEVICE_TYPE}}|${DEVICE_TYPE}|g" \
+              -e "s|{{SUITE}}|${SUITE}|g" \
               -e "s|{{GITHUB_REPOSITORY}}|${GITHUB_REPOSITORY}|g" \
               -e "s|{{GITHUB_RUN_ATTEMPT}}|${GITHUB_RUN_ATTEMPT}|g" \
               -e "s|{{GITHUB_RUN_ID}}|${GITHUB_RUN_ID}|g" \

.github/workflows/linux.yml

@@ -150,3 +150,4 @@ jobs:
     secrets: inherit
     with:
       url: ${{ needs.debos-linux-deb.outputs.artifacts_url }}
+      suite: trixie

README.md

@@ -150,6 +150,7 @@ A few options are provided in the debos recipes; for the root filesystem recipe:
 - `kernelpackage`: name of the kernel package to install from apt; defaults to
   `Debian’s linux-image-arm64`. Can (and should) be set to `none` if you are
   providing local kernel package instead.
+- `suite`: Debian suite to use, defaults to `trixie`.
 
 For the image recipe:
 

ci/lava/qcs6490-rb3gen2-vision-kit/boot.yaml

@@ -4,7 +4,7 @@ actions:
       image:
         headers:
           Authorization: Q_S3_TOKEN
-        url: "{{BUILD_DOWNLOAD_URL}}/flash-ufs.tar.gz"
+        url: "{{BUILD_DOWNLOAD_URL}}/{{SUITE}}-flash-ufs.tar.gz"
     postprocess:
       docker:
         image: ghcr.io/foundriesio/lava-lmp-sign:main

ci/lava/qrb2210-rb1/boot.yaml

@@ -4,7 +4,7 @@ actions:
       image:
         headers:
           Authorization: Q_S3_TOKEN
-        url: "{{BUILD_DOWNLOAD_URL}}/flash-emmc.tar.gz"
+        url: "{{BUILD_DOWNLOAD_URL}}/{{SUITE}}-flash-emmc.tar.gz"
     postprocess:
       docker:
         image: ghcr.io/foundriesio/lava-lmp-sign:main