From 5f90230dbd183c29ade98ac3180a4eb3756a7834 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Thu, 11 May 2017 21:02:10 +0200
Subject: [PATCH] last one cleans (for manual start after one stage failed)

---
 .gitlab-ci.yml | 13 +++++++------
 PRIVATE        |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a40a90ec9..3aa2bfb20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,8 +21,8 @@ stages:
 
 ###################################################################################################
 before_script:
-  - if [ $(awk "/$CI_PIPELINE_ID/{print NR}" $HOME/GitLabCI.queue)x == 'x' ]; then echo $CI_PIPELINE_ID >> $HOME/GitLabCI.queue; fi
-  - while [ $(awk "/$CI_PIPELINE_ID/{print NR}" $HOME/GitLabCI.queue) -ne 1 ];do sleep 5m; done
+  - if [ $(awk "/$CI_PIPELINE_ID/{print NR}" $TESTROOT/GitLabCI.queue)x == 'x' ]; then echo $CI_PIPELINE_ID >> $TESTROOT/GitLabCI.queue; fi
+  - while [ $(awk "/$CI_PIPELINE_ID/{print NR}" $TESTROOT/GitLabCI.queue) -ne 1 ];do sleep 5m; done
   - source $DAMASKROOT/DAMASK_env.sh
   - cd $DAMASKROOT/PRIVATE/testing
 
@@ -36,7 +36,7 @@ variables:
   #================================================================================================
   # Shortcut names
   #================================================================================================
-  DAMASKROOT:                      "$HOME/GitLabCI_Pipeline_$CI_PIPELINE_ID/DAMASK"
+  DAMASKROOT:                      "$TESTROOT/GitLabCI_Pipeline_$CI_PIPELINE_ID/DAMASK"
 
   #================================================================================================
   # Names of module files to load
@@ -82,8 +82,8 @@ variables:
 checkout: 
   stage: prepareAll
   before_script: 
-    - echo $CI_PIPELINE_ID >> $HOME/GitLabCI.queue
-    - while [ $(awk "/$CI_PIPELINE_ID/{print NR}" $HOME/GitLabCI.queue) -ne 1 ];do sleep 5m; done
+    - echo $CI_PIPELINE_ID >> $TESTROOT/GitLabCI.queue
+    - while [ $(awk "/$CI_PIPELINE_ID/{print NR}" $TESTROOT/GitLabCI.queue) -ne 1 ];do sleep 5m; done
   script:
     - mkdir -p $DAMASKROOT
     - cd $DAMASKROOT
@@ -492,6 +492,7 @@ mergeIntoMaster:
     - git pull
     - git merge master -s recursive -X ours -m "[skip ci] Merge branch 'master' into development"   # only possible conflict is in VERSION file
     - git push origin development                                                                   # development is unchanged (as master is based on it) but has updated VERSION file
+    - sed -i "/$CI_PIPELINE_ID/d" $TESTROOT/GitLabCI.queue
   only:
     - development
 
@@ -501,7 +502,7 @@ removeLock:
   before_script: 
     - echo 'Do nothing'
   when: always
-  script: sed -i "/$CI_PIPELINE_ID/d" $HOME/GitLabCI.queue
+  script: sed -i "/$CI_PIPELINE_ID/d" $TESTROOT/GitLabCI.queue
   except:
     - master
     - release
diff --git a/PRIVATE b/PRIVATE
index bc2d351db..3ba3671e3 160000
--- a/PRIVATE
+++ b/PRIVATE
@@ -1 +1 @@
-Subproject commit bc2d351db9d0fdc08b879c63f2667af34a6aab8b
+Subproject commit 3ba3671e3d0ec9ac1dcc6a5521822b4828574581