From e2b2ea3776bda9d537cf01012c8b236cdfad4230 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 3 Apr 2025 09:36:37 +0200
Subject: [PATCH] fmf: Use mkosi/mkosi.local.conf if the mkosi/ directory
 exists

https://github.com/systemd/systemd/pull/36954 will move all the mkosi
configuration in the systemd repository into a mkosi/ subdirectory. This
means we have to put mkosi.local.conf in that subdirectory as well, so check
if the mkosi/ directory exists and put mkosi.local.conf in there if it exists.

The mkosi/ directory will conflict with our checkout of mkosi so we move that
checkout one level up. Additionally, we can't use .. anymore as the package
directory as that only works when mkosi.local.conf is in the top level directory
of the repository so we use an absolute path instead.
---
 plans/run-integration-tests.sh | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/plans/run-integration-tests.sh b/plans/run-integration-tests.sh
index 9f8bd5f..1393b72 100755
--- a/plans/run-integration-tests.sh
+++ b/plans/run-integration-tests.sh
@@ -30,39 +30,48 @@ else
     exit 1
 fi
 
+PACKAGEDIR="$PWD"
+
 mkdir systemd
 rpm2cpio ./systemd-*.src.rpm | cpio --to-stdout --extract './*.tar.gz' | tar xz --strip-components=1 -C systemd
-pushd systemd
 
 # Now prepare mkosi at the same version required by the systemd repo.
 git clone https://github.com/systemd/mkosi
-mkosi_hash="$(grep systemd/mkosi@ .github/workflows/mkosi.yml | sed "s|.*systemd/mkosi@||g")"
+mkosi_hash="$(grep systemd/mkosi@ systemd/.github/workflows/mkosi.yml | sed "s|.*systemd/mkosi@||g")"
 git -C mkosi checkout "$mkosi_hash"
 
 export PATH="$PWD/mkosi/bin:$PATH"
 
+pushd systemd
+
 # shellcheck source=/dev/null
 . /etc/os-release || . /usr/lib/os-release
 
-tee mkosi.local.conf <<EOF
+if [[ -d mkosi ]]; then
+    LOCAL_CONF=mkosi/mkosi.local.conf
+else
+    LOCAL_CONF=mkosi.local.conf
+fi
+
+tee "$LOCAL_CONF" <<EOF
 [Distribution]
 Distribution=${MKOSI_DISTRIBUTION:-$ID}
 Release=${MKOSI_RELEASE:-${VERSION_ID:-rawhide}}
 
 [Content]
-PackageDirectories=..
+PackageDirectories=$PACKAGEDIR
 SELinuxRelabel=yes
 
 [Build]
 ToolsTreeDistribution=${MKOSI_DISTRIBUTION:-$ID}
 ToolsTreeRelease=${MKOSI_RELEASE:-${VERSION_ID:-rawhide}}
-ToolsTreePackageDirectories=..
+ToolsTreePackageDirectories=$PACKAGEDIR
 Environment=NO_BUILD=1
 WithTests=yes
 EOF
 
 if [[ -n "${MKOSI_REPOSITORIES:-}" ]]; then
-    tee --append mkosi.local.conf <<EOF
+    tee --append "$LOCAL_CONF" <<EOF
 [Distribution]
 Repositories=$MKOSI_REPOSITORIES
 
@@ -72,7 +81,7 @@ EOF
 fi
 
 if [[ -n "${TEST_SELINUX_CHECK_AVCS:-}" ]]; then
-    tee --append mkosi.local.conf <<EOF
+    tee --append "$LOCAL_CONF" <<EOF
 [Runtime]
 KernelCommandLineExtra=systemd.setenv=TEST_SELINUX_CHECK_AVCS=$TEST_SELINUX_CHECK_AVCS
 EOF