From d6074d184990e07756dc771d7b7dea69c3e91058 Mon Sep 17 00:00:00 2001 From: Danathar Date: Thu, 5 Nov 2026 18:02:36 -0500 Subject: [PATCH 1/2] fix(e2e): start ponytail under a unit name the image cannot already own #1108 starts gnome-ponytail-daemon with systemd-run --user --unit=gnome-ponytail-daemon. On dakota:testing that fails before any test runs: "Unit gnome-ponytail-daemon.service was already loaded or has a fragment file." Every GUI and lifecycle shard on main now fails at "Install gnome-ponytail-daemon" (run 42124147912: smoke-a, smoke-b, smoke-firefox, lifecycle), which is what keeps v1 held (#1087). Use the unit name testsuite-ponytail-daemon instead, and fall back to the previous nohup start if the user manager refuses the transient unit for any other reason. The bus-name wait that follows is unchanged. Refs #1087, #1108 Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01SnzFs53Qcer1xDySyxv1Vj Signed-off-by: Danathar --- .github/workflows/e2e.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 12163fb82..25c8c734e 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -1405,8 +1405,14 @@ jobs: source /tmp/session.env # Keep the daemon outside the SSH session scope: logind can kill # session processes when the ControlMaster connection expires. - systemd-run --user --quiet --collect --unit=gnome-ponytail-daemon \ - -- /bin/bash -c 'source /tmp/session.env; exec \$HOME/.local/libexec/gnome-ponytail-daemon >/tmp/ponytail-daemon.log 2>&1' + # Use a unit name the image cannot already own: on dakota:testing, + # systemd-run --unit=gnome-ponytail-daemon fails with already + # loaded or has a fragment file. Fall back to nohup if the user + # manager refuses the transient unit for any other reason. + if ! systemd-run --user --quiet --collect --unit=testsuite-ponytail-daemon \ + -- /bin/bash -c 'source /tmp/session.env; exec \$HOME/.local/libexec/gnome-ponytail-daemon >/tmp/ponytail-daemon.log 2>&1'; then + nohup \$HOME/.local/libexec/gnome-ponytail-daemon >/tmp/ponytail-daemon.log 2>&1 & + fi for i in \$(seq 1 15); do dbus-send --session --print-reply \ --dest=org.freedesktop.DBus /org/freedesktop/DBus \ From d727584b79fcaee8b9c21f1dff334edf601b3711 Mon Sep 17 00:00:00 2001 From: Danathar Date: Fri, 6 Nov 2026 06:30:44 -0500 Subject: [PATCH 2/2] fix(e2e): drop the nohup fallback for the ponytail daemon The e2e skill doc requires setup to fail when the transient user unit cannot start: a nohup'd daemon in the SSH session is killed by logind when the ControlMaster connection expires, leaving a stale D-Bus owner. Keep the unit rename and let systemd-run failures fail setup again. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01SnzFs53Qcer1xDySyxv1Vj Signed-off-by: Danathar --- .github/workflows/e2e.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 25c8c734e..e7b4731af 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -1407,12 +1407,9 @@ jobs: # session processes when the ControlMaster connection expires. # Use a unit name the image cannot already own: on dakota:testing, # systemd-run --unit=gnome-ponytail-daemon fails with already - # loaded or has a fragment file. Fall back to nohup if the user - # manager refuses the transient unit for any other reason. - if ! systemd-run --user --quiet --collect --unit=testsuite-ponytail-daemon \ - -- /bin/bash -c 'source /tmp/session.env; exec \$HOME/.local/libexec/gnome-ponytail-daemon >/tmp/ponytail-daemon.log 2>&1'; then - nohup \$HOME/.local/libexec/gnome-ponytail-daemon >/tmp/ponytail-daemon.log 2>&1 & - fi + # loaded or has a fragment file. + systemd-run --user --quiet --collect --unit=testsuite-ponytail-daemon \ + -- /bin/bash -c 'source /tmp/session.env; exec \$HOME/.local/libexec/gnome-ponytail-daemon >/tmp/ponytail-daemon.log 2>&1' for i in \$(seq 1 15); do dbus-send --session --print-reply \ --dest=org.freedesktop.DBus /org/freedesktop/DBus \