From 56bcf5979e2be6063e39493cd219f2223325fe26 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      | 6 ++++--
 .../mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf       | 2 --
 mkosi/resources/mkosi-tools/mkosi.conf.d/10-ubuntu.conf  | 9 +++++++++
 6 files changed, 17 insertions(+), 14 deletions(-)
 delete mode 100644 mkosi.conf.d/20-debian-tools.conf
 create mode 100644 mkosi/resources/mkosi-tools/mkosi.conf.d/10-ubuntu.conf

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 534550529..49a682f66 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -120,6 +120,9 @@ jobs:
           # TODO: Try again once Arch gets a new rpm release.
           - distro: centos
             tools: arch
+          # TODO: Re-enable once pacman-package-manager is back in testing
+          - distro: arch
+            tools: debian
 
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
@@ -181,7 +184,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 51cf22188..000000000
--- 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 71f6934e6..8ead9b513 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 a65670a82..050df6339 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,8 @@ Packages=
         archlinux-keyring
         dbus-broker
         dnf
-        makepkg
-        pacman-package-manager
+        # TODO: Add back again once makepkg is back in testing.
+        # makepkg
+        # TODO: Add back again once pacman-package-manager is back in testing.
+        # pacman-package-manager
         swtpm
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf
index 1f1b7f23f..ce27a589a 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu.conf
@@ -18,10 +18,8 @@ Packages=
         grub2
         libarchive-tools
         libtss2-dev
-        makepkg
         openssh-client
         ovmf
-        pacman-package-manager
         pesign
         policycoreutils
         python3-cryptography
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-ubuntu.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-ubuntu.conf
new file mode 100644
index 000000000..1dd1e1e27
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-ubuntu.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=ubuntu
+
+[Content]
+Packages=
+        pacman-package-manager
+        makepkg
-- 
2.47.2