From: Luca Boccassi <bluca@debian.org>
Date: Mon, 3 Jun 2024 13:51:15 +0000 (+0100)
Subject: Revert "test: Run end.sh when running integration tests with mkosi"
X-Git-Tag: v256-rc4~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88c2ef1f75a94b1b94aecad79393e0c76134f265;p=thirdparty%2Fsystemd.git

Revert "test: Run end.sh when running integration tests with mkosi"

It seems this introduced a regression in the CentOS CI;

14:25:58 FAILED TASKS:14:25:58 -------------
14:25:58 TEST-03-JOBS
14:25:58 TEST-52-HONORFIRSTSHUTDOWN
14:25:58 TEST-63-PATH

Revert for now.

This reverts commit da3c6fc55363af2163b4d2613c9951bdaea24810.
---

diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index 0c9649301c4..5b098a3e01f 100755
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -71,7 +71,6 @@ def main():
 
         [Service]
         StandardOutput=journal+console
-        ExecStart=/usr/lib/systemd/tests/testdata/units/end.sh
         """
     )
 
diff --git a/test/units/end.service b/test/units/end.service
index 5455a8f33b8..50a68b9dd49 100644
--- a/test/units/end.service
+++ b/test/units/end.service
@@ -3,7 +3,6 @@
 Description=End the test
 After=testsuite.target
 OnFailure=poweroff.target
-OnSuccess=poweroff.target
 OnFailureJobMode=replace-irreversibly
 
 [Service]
diff --git a/test/units/end.sh b/test/units/end.sh
index a18c9473eaf..cc1d7ee11eb 100755
--- a/test/units/end.sh
+++ b/test/units/end.sh
@@ -13,4 +13,5 @@ set -o pipefail
 (! journalctl -q -o short-monotonic --grep "[F]ailed to parse serialized line" >>/failed)
 (! journalctl -q -o short-monotonic --grep "[F]ailed to (de)?serialize \w+" >>/failed)
 
+systemctl poweroff --no-block
 exit 0