ci: add Ubuntu noble and resolute to PR matrix

Expand the PR build matrix to explicit distro+suite pairs: debian/trixie,
debian/forky, ubuntu/noble, and ubuntu/resolute.

In debos workflow, use distro to determine container image
(public.ecr.aws/<distro>/<distro>:<suite>) and install the matching
archive keyring package (ubuntu-keyring for Ubuntu,
debian-archive-keyring for Debian).

Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>

Author: lool

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

@@ -25,9 +25,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        suite: [trixie, forky]
+        include:
+          - distro: debian
+            suite: trixie
+          - distro: debian
+            suite: forky
+          - distro: ubuntu
+            suite: noble
+          - distro: ubuntu
+            suite: resolute
     uses: ./.github/workflows/debos.yml
     with:
       suite: ${{ matrix.suite }}
+      distro: ${{ matrix.distro }}
   schema-check:
     uses: ./.github/workflows/lava-schema-check.yml

.github/workflows/debos.yml

@@ -58,7 +58,7 @@ jobs:
       url: ${{ steps.upload_artifacts_s3.outputs.url }}
     runs-on: [self-hosted, qcom-u2404, arm64]
     container:
-      image: public.ecr.aws/debian/debian:${{ inputs.suite }}
+      image: public.ecr.aws/${{ inputs.distro }}/${{ inputs.distro }}:${{ inputs.suite }}
       volumes:
         - /efs/qli/metaqcom/gh-runners/quic-yocto/downloads:/fileserver-downloads
       options: --privileged
@@ -81,7 +81,13 @@ jobs:
 
       # mtools is needed for the flash recipe
       - name: Install debos and dependencies of the recipes and local tests
-        run: apt -y install debian-archive-keyring debos make mmdebstrap mtools python3-pexpect python3-pytest qemu-efi-aarch64 qemu-system-arm
+        run: |
+          set -ux
+          keyring=debian-archive-keyring
+          if [ "${{ inputs.distro }}" = "ubuntu" ]; then
+            keyring=ubuntu-keyring
+          fi
+          apt -y install "$keyring" debos make mmdebstrap mtools python3-pexpect python3-pytest qemu-efi-aarch64 qemu-system-arm
 
       - name: Setup local APT repo
         run: |