From 56c57bcb920a8a5ff5e5ce2b3381eb100539f51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= <ole.schuett@cp2k.org>
Date: Thu, 10 Jan 2019 21:13:03 +0100
Subject: [PATCH] Docker: Start report uploading immediately and remove md5sum
 output

---
 tools/docker/scripts/ci_entrypoint.sh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/tools/docker/scripts/ci_entrypoint.sh b/tools/docker/scripts/ci_entrypoint.sh
index 49b78eaac2..12d2be915d 100755
--- a/tools/docker/scripts/ci_entrypoint.sh
+++ b/tools/docker/scripts/ci_entrypoint.sh
@@ -28,6 +28,17 @@ function upload_file {
     wget --quiet --output-document=- --method=PUT --header="content-type: ${CONTENT_TYPE}" --header="cache-control: no-cache" --body-file="${FILE}" "${URL}" > /dev/null
 }
 
+# Upload preliminary report every 30s in the background.
+(
+while true ; do
+    sleep 1
+    count=$(( (count + 1) % 30 ))
+    if (( count == 1 )) && [ -n "${REPORT_UPLOAD_URL}" ]; then
+        upload_file "${REPORT_UPLOAD_URL}" "${REPORT}" "text/plain;charset=utf-8"
+    fi
+done
+)&
+
 # Calculate checksums of critical files.
 CHECKSUMS=/workspace/checksums.md5
 shopt -s nullglob  # ignore missing files
@@ -86,7 +97,6 @@ fi
 
 if ! md5sum --status --check ${CHECKSUMS}; then
     echo -e "\n========== Cleaning Build Cache ==========" | tee -a $REPORT
-    (md5sum --quiet --check ${CHECKSUMS} || true) |& tee -a $REPORT
     cd /workspace/cp2k
     make distclean |& tee -a $REPORT
 fi
@@ -95,16 +105,7 @@ fi
 if $TOOLCHAIN_OK ; then
     echo -e "\n========== Running Test ==========" | tee -a $REPORT
     cd /workspace
-    "$@" |& tee -a $REPORT &  # Launch in the background.
-
-    # Upload preliminary report every 30s while test is running.
-    while jobs %1 &> /dev/null ; do
-        sleep 1
-        count=$(( (count + 1) % 30 ))
-        if (( count == 1 )) && [ -n "${REPORT_UPLOAD_URL}" ]; then
-            upload_file "${REPORT_UPLOAD_URL}" "${REPORT}" "text/plain;charset=utf-8"
-        fi
-    done
+    "$@" |& tee -a $REPORT
 fi
 
 # Wrap up.