From 742d01765ee98f118b2262dfb2e3ee5d34915ca0 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Mon, 8 May 2017 23:52:07 +0200
Subject: [PATCH] now also running runtime test

---
 .gitlab-ci.yml | 48 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f472d2bb8..a40a90ec9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ stages:
   - compileAbaqus2016
   - compileAbaqus2017
   - example
+  - performance
   - createDocumentation
   - updateMaster
   - clean
@@ -425,25 +426,19 @@ AbaqusExample:
   only:
     - development
 
-##################################################################################################
-mergeIntoMaster: 
-  stage: updateMaster
+###################################################################################################
+SpectralRuntime:
+  stage: performance
   script:
+    - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel
     - cd $DAMASKROOT
-    - export TESTEDREV=$(git describe)                                                              # might be detached from development branch
-    - echo $TESTEDREV > VERSION
-    - git commit VERSION -m "[skip ci] updated version information after successful test of $TESTEDREV"
-    - export UPDATEDREV=$(git describe)                                                             # tested state + 1 commit
-    - git checkout master
-    - git merge $UPDATEDREV -s recursive -X ours                                                    # conflicts occur only for inconsistent state
-    - git push origin master                                                                        # master is now tested version and has updated VERSION file
-    - git checkout development
-    - 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
-  only:
-    - development
-
+    - make clean spectral processing OPTIMIZATION=AGGRESSIVE
+    - cd $DAMASKROOT/PRIVATE/testing
+    - SpectralAll_runtime/test.py
+  except:
+    - master
+    - release
+ 
 ###################################################################################################
 AbaqusExp: 
   stage: createDocumentation
@@ -481,6 +476,25 @@ Spectral:
     - master
     - release
 
+##################################################################################################
+mergeIntoMaster: 
+  stage: updateMaster
+  script:
+    - cd $DAMASKROOT
+    - export TESTEDREV=$(git describe)                                                              # might be detached from development branch
+    - echo $TESTEDREV > VERSION
+    - git commit VERSION -m "[skip ci] updated version information after successful test of $TESTEDREV"
+    - export UPDATEDREV=$(git describe)                                                             # tested state + 1 commit
+    - git checkout master
+    - git merge $UPDATEDREV -s recursive -X ours                                                    # conflicts occur only for inconsistent state
+    - git push origin master                                                                        # master is now tested version and has updated VERSION file
+    - git checkout development
+    - 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
+  only:
+    - development
+
 ###################################################################################################
 removeLock: 
   stage: clean