From b4fc8367a2c3d3edf37c7304d81da76b4df6c8c0 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Tue, 2 May 2017 12:21:36 +0200
Subject: [PATCH 1/3] lock handling for each stage independently

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7447fa649..116a8059f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,8 @@ stages:
 
 ###################################################################################################
 before_script:
+  - [ $(awk "/$CI_PIPELINE_ID/{print NR}" $HOME/GitLabCI.queue)x == 'x' ] && echo $CI_PIPELINE_ID >> $HOME/GitLabCI.queue
+  - while [ $(awk "/$CI_PIPELINE_ID/{print NR}" $HOME/GitLabCI.queue) -ne 1 ];do sleep 5m; done
   - source $DAMASKROOT/DAMASK_env.sh
   - cd $DAMASKROOT/PRIVATE/testing
 
@@ -52,9 +54,9 @@ variables:
   MPICH_GNU:                       "$MPICH3_2GNU5_3"
   MPICH_Intel:                     "$MPICH3_2Intel17_0"
   # ++++++++++++ PETSc +++++++++++++++++++++++++++++++++++++++++++++++++
-  PETSc3_6_4MPICH3_2Intel17_0:     "Libraries/PETSc/3.6.4/Intel-17.0-MPICH-3.2"
-  PETSc3_7_6MPICH3_2Intel17_0:     "Libraries/PETSc/3.7.5/Intel-17.0-MPICH-3.2"
+  PETSc3_7_6MPICH3_2Intel17_0:     "Libraries/PETSc/3.7.6/Intel-17.0-MPICH-3.2"
   PETSc3_7_5MPICH3_2Intel17_0:     "Libraries/PETSc/3.7.5/Intel-17.0-MPICH-3.2"
+  PETSc3_6_4MPICH3_2Intel17_0:     "Libraries/PETSc/3.6.4/Intel-17.0-MPICH-3.2"
   PETSc3_7_5MPICH3_2GNU5_3:        "Libraries/PETSc/3.7.5/GNU-5.3-MPICH-3.2"
   # ------------ Defaults ----------------------------------------------
   PETSc_MPICH_Intel:               "$PETSc3_7_6MPICH3_2Intel17_0"
@@ -83,8 +85,8 @@ checkout:
     - while [ $(awk "/$CI_PIPELINE_ID/{print NR}" $HOME/GitLabCI.queue) -ne 1 ];do sleep 5m; done
   script:
     - mkdir -p $DAMASKROOT
-    - git clone -q git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT
     - cd $DAMASKROOT
+    - git clone -q git@magit1.mpie.de:damask/DAMASK.git .
     - git checkout $CI_COMMIT_SHA
     - git submodule update --init
     - source DAMASK_env.sh
@@ -202,11 +204,9 @@ Compile_GNU:
 ###################################################################################################
 Compile_Intel_Prepare:
   stage: prepareSpectral
-  before_script: 
-    - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel
   script:
+    - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel
     - cd $DAMASKROOT
-    - source DAMASK_env.sh
     - make clean spectral processing
   except:
     - master

From ad86187f9910b69182930f1033a1261201f80610 Mon Sep 17 00:00:00 2001
From: Test User <damask_user@mpie.de>
Date: Tue, 2 May 2017 17:42:24 +0200
Subject: [PATCH 2/3] [skip ci] updated version information after successful
 test of v2.0.1-674-g86c85f0

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index c9ec7b30b..d3e901094 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.0.1-649-gf21a4f0
+v2.0.1-674-g86c85f0

From e8b69b748f9a8b9f20eee64e9c3b74e2fc2716d2 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Tue, 2 May 2017 18:15:53 +0200
Subject: [PATCH 3/3] short version of if statement causes problems

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 116a8059f..f472d2bb8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ stages:
 
 ###################################################################################################
 before_script:
-  - [ $(awk "/$CI_PIPELINE_ID/{print NR}" $HOME/GitLabCI.queue)x == 'x' ] && echo $CI_PIPELINE_ID >> $HOME/GitLabCI.queue
+  - 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
   - source $DAMASKROOT/DAMASK_env.sh
   - cd $DAMASKROOT/PRIVATE/testing