Fixes for CI tests (mr !503)

- fixed clash between two GaudiHive tests
- avoid artificial check step in Gitlab-CI

(cherry picked from commit c80a08ef)

2a1aecd0 Avoid clash between GaudiHive read and read_and_write tests
e467631b Avoid artificial check step in Gitlab-CI

.gitlab-ci.yml

 stages:
   - build
   - test
-  - check
   - deploy
 
 before_script:
@@ -43,11 +42,11 @@ coding-conventions:
     - pip install autopep8
     - make BUILDDIR=build apply-formatting
     - git diff > apply-formatting.patch
-    - git diff --stat | tee apply-formatting.stat
+    - git diff --stat --exit-code
   artifacts:
     paths:
       - apply-formatting.patch
-      - apply-formatting.stat
+    when: on_failure
     expire_in: 1 day
 
 doxygen:
@@ -82,31 +81,18 @@ test:
     - mv build/html test_report
     - mv build/ctest.log test_report
     - mv build/Testing test_report
-  artifacts:
-    paths:
-      - test_report
-    expire_in: 1 week
-
-test_report:
-  stage: check
-  script:
-    - status=0
-    - echo "=== code formatting report ==="
-    - if [ $(wc -c apply-formatting.stat | cut -d' ' -f1) != 0 ] ; then
-    -   cat apply-formatting.stat
-    -   status=1
-    - else
-    -   echo formatting OK
-    - fi
-    - echo "=== tests report ==="
     - if [ -e test_report/tests_failed ] ; then
     # this prints all lines starting with a white space after and including "The following tests...", excluding lines with "Not Run"
+    -   echo "================================================================================"
     -   awk '/^[^[:space:]]/{do_print=0}; /The following tests FAILED:/{do_print=1}; do_print&&!/Not Run/{print}' test_report/ctest.log
-    -   status=1
-    - else
-    -   echo tests successful
+    -   echo "================================================================================"
+    -   exit 1
     - fi
-    - exit $status
+  artifacts:
+    paths:
+      - test_report
+    when: always
+    expire_in: 1 week
 
 # see https://gitlab.cern.ch/gitlabci-examples/deploy_eos for the details
 # of the configuration

GaudiHive/tests/qmtest/gaudihive.qms/whiteboard.qms/read_and_write.qmt

@@ -8,6 +8,7 @@
 <argument name="use_temp_dir"><enumeral>true</enumeral></argument>
 <argument name="timeout"><integer>120</integer></argument>
 <argument name="prerequisites"><set>
+  <tuple><text>gaudihive.whiteboard.read</text><enumeral>PASS</enumeral></tuple>
   <tuple><text>gaudihive.whiteboard.write</text><enumeral>PASS</enumeral></tuple>
 </set></argument>
 </extension>