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 0c9649301c4f772415412a39f3e22751c7e85a47..5b098a3e01f3c95e93f3981ea60a8e27fe990492 100755 (executable)
--- 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 5455a8f33b8a5e975664bbf996f5d41757f8e24b..50a68b9dd49d8f00ef34aa4e168b3bf9203398a2 100644 (file)
--- 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 a18c9473eaf3629887eab731a3f8c43d5f8bd904..cc1d7ee11ebbdfb95f984228b3b4fba726a1750b 100755 (executable)
--- 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