From 626409aac9cafb7ecaf1f5dbd3783f717ad4c280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
Date: Wed, 22 Apr 2020 14:58:55 +0200
Subject: [PATCH] Properly fail the GitLab CI system test job when any system
 test fails

---
 .gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0245affc04..6c74136089 100644
--- 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"