test: Merge systemd-main scenario into daily (#22279)

Now that the scenario is working, let's keep it that way and test it
every day.

Related-to: #22266

Author: martinpitt

test/run

@@ -38,11 +38,6 @@ case "${TEST_SCENARIO:=}" in
         RUN_OPTS="$RUN_OPTS "
         PREPARE_OPTS="$PREPARE_OPTS --overlay"
         ;;&
-   *systemd-main*)
-        bots/image-customize --fresh -v --script test/vm.systemd-main "$TEST_OS"
-        RUN_OPTS="$RUN_OPTS "
-        PREPARE_OPTS="$PREPARE_OPTS --overlay"
-        ;;&
    *updates-testing*)
         bots/image-customize --fresh -v --script test/vm.updates-testing "$TEST_OS"
         RUN_OPTS="$RUN_OPTS "

test/vm.daily

@@ -6,4 +6,14 @@ exec >&2
 dnf -y copr enable rpmsoftwaremanagement/dnf-nightly
 dnf -y copr enable @storage/udisks-daily
 dnf -y --setopt=install_weak_deps=False update
+
+grep -q 'ID=.*fedora' /etc/os-release
+
+# systemd main branch builds
+. /etc/os-release
+fedora_release="Fedora_${VERSION_ID}"
+echo "https://download.opensuse.org/repositories/system:systemd/${fedora_release}/system:systemd.repo"
+dnf config-manager addrepo --from-repofile="https://download.opensuse.org/repositories/system:systemd/${fedora_release}/system:systemd.repo"
+dnf -y update --repo=system_systemd --setopt=install_weak_deps=False
+
 /var/lib/download-package-sets.sh