.github/workflows/mkosi.yml

@@ -110,7 +110,7 @@ jobs:
             no_kvm: 0
             shim: 0
           - distro: fedora
-            release: "43"
+            release: "42"
             runner: ubuntu-24.04
             sanitizers: address,undefined
             llvm: 1

.semaphore/semaphore-runner.sh

@@ -7,7 +7,7 @@ set -o pipefail
 DISTRO="${DISTRO:-debian}"
 RELEASE="${RELEASE:-bookworm}"
 SALSA_URL="${SALSA_URL:-https://salsa.debian.org/systemd-team/systemd.git}"
-BRANCH="${BRANCH:-ci/v258-stable}"
+BRANCH="${BRANCH:-debian/master}"
 ARCH="${ARCH:-amd64}"
 CONTAINER="${RELEASE}-${ARCH}"
 CACHE_DIR=/var/tmp

mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf

@@ -37,7 +37,6 @@ Packages=
         btrfs-progs
         apt
         bind9-dnsutils
-        bsdutils
         cryptsetup-bin
         dbus-broker
         dbus-user-session

mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/knot.conf

@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-# New package needed for TEST-75-RESOLVED
-
-[TriggerMatch]
-Distribution=debian
-Release=!bullseye
-Release=!bookworm
-Release=!trixie
-# TODO: drop once Duke ships
-Release=!oldstable
-# TODO: drop once Forky ships
-Release=!stable
-
-[TriggerMatch]
-Distribution=ubuntu
-Release=!jammy
-Release=!noble
-Release=!plucky
-Release=!questing
-
-[TriggerMatch]
-Distribution=kali
-
-[Content]
-Packages=knot-keymgr

mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf

@@ -4,6 +4,6 @@
 Environment=
         GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
         GIT_SUBDIR=debian
-        GIT_BRANCH=ci/v258-stable
-        GIT_COMMIT=9e5e8550f9413206441aaebe898511b3985b61ae
+        GIT_BRANCH=debian/master
+        GIT_COMMIT=8ba719208ff28f36bc240328725eb10008838c39
         PKG_SUBDIR=debian

mkosi/mkosi.sanitizers/mkosi.postinst

@@ -90,7 +90,6 @@ wrap=(
     socat
     sshd
     stat
-    stress-ng
     su
     tar
     tgtd