From a06c2674b4f6ac0812b8c974204d6b2446df85e8 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 26 Mar 2024 12:17:51 +0100
Subject: [PATCH] Switch back to debian testing

unstable breaks too much to be useful for CI. To keep CI green, we
stop installing pacman-package-manager in the default images and disable
debian tools tree in CI.
---
 .github/workflows/ci.yml                                   | 5 ++---
 mkosi.conf.d/20-debian-tools.conf                          | 7 -------
 mkosi.conf.d/20-debian/mkosi.conf                          | 2 +-
 .../30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf        | 5 +++--
 4 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 mkosi.conf.d/20-debian-tools.conf

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 534550529d..dc4ee94624 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,7 +102,8 @@ jobs:
           - ubuntu
         tools:
           - arch
-          - debian
+          # TODO: Re-enable once pacman-package-manager is back in testing
+          # - debian
           - fedora
           - opensuse
           - ubuntu
@@ -181,7 +182,5 @@ jobs:
             --verbose \
             -m integration \
             --distribution ${{ matrix.distro }} \
-            $([ "${{ matrix.distro }}" = "debian" ] && echo --release=unstable) \
-            $([ "${{ matrix.tools }}" = "debian" ] && echo --tools-tree-release=unstable) \
             --tools-tree-distribution ${{ matrix.tools }} \
             tests/
diff --git a/mkosi.conf.d/20-debian-tools.conf b/mkosi.conf.d/20-debian-tools.conf
deleted file mode 100644
index 51cf221887..0000000000
--- a/mkosi.conf.d/20-debian-tools.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-ToolsTreeDistribution=debian
-
-[Host]
-@ToolsTreeRelease=unstable
diff --git a/mkosi.conf.d/20-debian/mkosi.conf b/mkosi.conf.d/20-debian/mkosi.conf
index 71f6934e61..8ead9b513d 100644
--- a/mkosi.conf.d/20-debian/mkosi.conf
+++ b/mkosi.conf.d/20-debian/mkosi.conf
@@ -4,7 +4,7 @@
 Distribution=debian
 
 [Distribution]
-@Release=unstable
+@Release=testing
 Repositories=non-free-firmware
 
 [Content]
diff --git a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf
index a65670a826..66d2a4437d 100644
--- a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf
+++ b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf
@@ -9,6 +9,7 @@ Packages=
         archlinux-keyring
         dbus-broker
         dnf
-        makepkg
-        pacman-package-manager
+        # TODO: Add back once pacman-package-manager is back in testing
+        # makepkg
+        # pacman-package-manager
         swtpm