diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index bc56e7868..54ba8b8f3 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -1306,7 +1306,10 @@ jobs: # Pre-start the daemon and wait for it to register on the session bus source /tmp/session.env - nohup \$HOME/.local/libexec/gnome-ponytail-daemon >/tmp/ponytail-daemon.log 2>&1 & + # 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' for i in \$(seq 1 15); do dbus-send --session --print-reply \ --dest=org.freedesktop.DBus /org/freedesktop/DBus \ diff --git a/docs/skills/ci-ops/e2e-workflow/SKILL.md b/docs/skills/ci-ops/e2e-workflow/SKILL.md index f80bda562..c24ace9fa 100644 --- a/docs/skills/ci-ops/e2e-workflow/SKILL.md +++ b/docs/skills/ci-ops/e2e-workflow/SKILL.md @@ -240,7 +240,7 @@ The OCI image under test **must**: - Include GNOME + GDM - Have `python3` available in the deployment -**`gnome-ponytail-daemon` is built at runtime** — the workflow compiles it from source in a `debian:bookworm` container on the runner and SCPs the binary into the VM. The image does NOT need to ship `gnome-ponytail-daemon`. (See step 20 above.) +**`gnome-ponytail-daemon` is built at runtime** — the workflow compiles it from source in a `debian:bookworm` container on the runner and SCPs the binary into the VM. The image does NOT need to ship `gnome-ponytail-daemon`. (See step 20 above.) Start it as a transient `systemd --user` service sourcing `/tmp/session.env`: with `KillUserProcesses=yes`, logind kills SSH-session processes when ControlMaster expires, leaving the runner with a stale D-Bus owner. Fail setup if the service cannot start; do not fall back to `nohup` in the SSH session. The workflow injects the test user, SSH keys, autologin config, and the unsafe-mode gnome-shell extension at disk-prep time — nothing needs to be baked into the image for those.