From 66e7c7f338753fe66315514aee48f890ad4de79b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Thu, 27 Feb 2020 13:43:43 +0100
Subject: [PATCH] workaround for tests and tarpaulin

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 353ec24fb0..0a93f8de07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,7 +101,7 @@ unittests:
         - veloren-docker
     script:
         - echo "Workaround, cargo tests fails due some rust files are already deleted, so we just stack cargo test. if its the os error, it wont appear on them all, if its a real error, it will retry and then fail"
-        - cargo test || cargo test || cargo test || cargo test
+        - cargo test || ( sleep 10 && cargo test ) || ( sleep 10 && cargo test ) || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test || cargo test
 
 coverage:
     stage: build-post
@@ -111,7 +111,7 @@ coverage:
         - veloren-docker
     script:
         - echo "Workaround, tarpaulin fails due some rust files are already deleted, so we just stack tarpaulin. if its the os error, it wont appear on them all, if its a real error, it will retry and then fail"
-        - cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v
+        - cargo tarpaulin -v || ( sleep 10 && cargo tarpaulin -v ) || ( sleep 10 && cargo tarpaulin -v ) || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v || cargo tarpaulin -v
 
 benchmarks:
     stage: build-post
@@ -144,7 +144,6 @@ linux:
             - /^r[0-9]+\.[0-9]+\.[0-9]+/
             - /^v[0-9]+\.[0-9]+/
             - /^master$/
-            - /^docker-server$/
     tags:
         - veloren-docker
     script:
@@ -193,7 +192,6 @@ macos:
             - /^r[0-9]+\.[0-9]+\.[0-9]+/
             - /^v[0-9]+\.[0-9]+/
             - /^master$/
-            - /^docker-server$/
     tags:
         - veloren-docker
     script:
@@ -227,7 +225,6 @@ docker:
           - /^r[0-9]+\.[0-9]+\.[0-9]+/
           - /^v[0-9]+\.[0-9]+/
           - /^master$/
-          - /^docker-server$/
     tags:
         - veloren-docker
     script: