diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-08-24 13:33:00 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-08-24 13:33:06 +0200 |
| commit | 74ab2aaf9f27e1495a74c37932a634c82af9a57b (patch) | |
| tree | 8b9f83168bfcdac85572b2ea49dc711547a5aa85 /test/system | |
| parent | e20ec47a59b4ac65d42f3fee7b8b7ec5760ea35d (diff) | |
| download | podman-74ab2aaf9f27e1495a74c37932a634c82af9a57b.tar.gz podman-74ab2aaf9f27e1495a74c37932a634c82af9a57b.tar.bz2 podman-74ab2aaf9f27e1495a74c37932a634c82af9a57b.zip | |
Revert "generate systemd: custom stop signal"
This reverts commit 70801b3d714b067d64744697433c5841926dad4d.
It turns out that letting systemd handle stopping the container is not
working as I thought it will. Conmon is receiving the stop/kill signals
and may exit non-zero, which in turn lets the systemd service transition
into the `failed` state.
We need to get back to letting Podman stop the containers and do a
partial revert of commit 9ac5267 which removed using --cidfile.
Happening in a following commit.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'test/system')
| -rw-r--r-- | test/system/250-systemd.bats | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/test/system/250-systemd.bats b/test/system/250-systemd.bats index 37e5fa2f9..ee951ff21 100644 --- a/test/system/250-systemd.bats +++ b/test/system/250-systemd.bats @@ -125,17 +125,4 @@ function service_cleanup() { service_cleanup } -@test "podman generate systemd - stop-signal" { - cname=$(random_string) - run_podman create --name $cname --stop-signal=42 $IMAGE - run_podman generate systemd --new $cname - is "$output" ".*KillSignal=42.*" "KillSignal is set" - - # Regression test for #11304: systemd wants a custom stop-signal. - run_podman rm -f $cname - run_podman create --name $cname --systemd=true $IMAGE systemd - run_podman generate systemd --new $cname - is "$output" ".*KillSignal=37.*" "KillSignal is set" -} - # vim: filetype=sh |