Properly fail the GitLab CI system test job when any system test fails

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0245affc043e9558c23891200fe7b36f40c739e2..6c741360895d29821ea218626f25b4b89625d343 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -255,8 +255,9 @@ stages:
     - *setup_interfaces
     - *setup_softhsm
   script:
-    - ( cd bin/tests/system && make -j${TEST_PARALLEL_JOBS:-1} -k check V=1 ) || cat bin/tests/system/test-suite.log
-    - test -s bin/tests/system/test-suite.log
+    - cd bin/tests/system && make -j${TEST_PARALLEL_JOBS:-1} -k check V=1
+  after_script:
+    - cat bin/tests/system/test-suite.log
 
 .system_test: &system_test_job
   <<: *system_test_common
@@ -269,6 +270,7 @@ stages:
   <<: *system_test_common
   allow_failure: true
   after_script:
+    - cat bin/tests/system/test-suite.log
     - find bin -name 'tsan.*' -exec python3 util/parse_tsan.py {} \;
   artifacts:
     expire_in: "1 day"