From 34532f044b22cd45cd8d543c00a51ddb3cc3f66b Mon Sep 17 00:00:00 2001
From: Christopher Obbard <chris.obbard@collabora.com>
Date: Thu, 10 Aug 2023 11:04:53 +0100
Subject: [PATCH] ci: Add Debian bookworm/trixie debootstrap test

Ensure that we can build current debian stable & testing.

Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
---
 .github/workflows/ci.yaml | 9 ++++++---
 tests/debian/test.yaml    | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 58c07e55..77166578 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -125,9 +125,12 @@ jobs:
           - { name: "uml", backend: "--fakemachine-backend=uml" }
         test:
           - { name: "recipes", case: "recipes" }
-          - { name: "debian (amd64)", case: "debian", variables: "-t architecture:amd64" }
-          - { name: "debian (arm64)", case: "debian", variables: "-t architecture:arm64" }
-          - { name: "debian (armhf)", case: "debian", variables: "-t architecture:armhf" }
+          - { name: "debian (bookworm amd64)", case: "debian", variables: "-t architecture:amd64 -t suite:bookworm" }
+          - { name: "debian (bookworm arm64)", case: "debian", variables: "-t architecture:arm64 -t suite:bookworm" }
+          - { name: "debian (bookworm armhf)", case: "debian", variables: "-t architecture:armhf -t suite:bookworm" }
+          - { name: "debian (trixie amd64)", case: "debian", variables: "-t architecture:amd64 -t suite:trixie" }
+          - { name: "debian (trixie arm64)", case: "debian", variables: "-t architecture:arm64 -t suite:trixie" }
+          - { name: "debian (trixie armhf)", case: "debian", variables: "-t architecture:armhf -t suite:trixie" }
         include:
           - backend: { name: "arch", backend: "--fakemachine-backend=qemu" }
             test: { name: "arch", case: "arch" }
diff --git a/tests/debian/test.yaml b/tests/debian/test.yaml
index bf4adb2a..d53316a2 100644
--- a/tests/debian/test.yaml
+++ b/tests/debian/test.yaml
@@ -1,10 +1,12 @@
 ---
-{{- $architecture := or .architecture "amd64"}}
-architecture: {{$architecture}}
+{{- $architecture := or .architecture "amd64" }}
+{{- $suite := or .suite "bookworm" }}
+
+architecture: {{ $architecture }}
 
 actions:
   - action: debootstrap
-    suite: bullseye
+    suite: {{ $suite }}
     variant: minbase
     merged-usr: true