From 6bb89d8efc919f219ea8643a412c2965b04ae4fd Mon Sep 17 00:00:00 2001
From: Yeongdo Park <ignis@postech.ac.kr>
Date: Fri, 2 Nov 2018 16:10:28 -0400
Subject: [PATCH] remove openfoam build command in test job

---
 .gitlab-ci.yml | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 525651f..3d7f5f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,21 @@
 image: park0d/of4builder:cantera
 
-cache:
-  paths:
-    - OF4IW
-
-before_script:
-  - "[[ -d OF4IW/OpenFOAM-4.x ]] || git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/park0d/OpenFOAM-4.x.git OF4IW/OpenFOAM-4.x"
-  - "[[ -d OF4IW/ThirdParty-4.x ]] || git clone https://github.com/OpenFOAM/ThirdParty-4.x.git OF4IW/ThirdParty-4.x"
-  - source OF4IW/OpenFOAM-4.x/etc/bashrc
-  - cd OF4IW/OpenFOAM-4.x
-  - git remote remove origin
-  - git remote add origin https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/park0d/OpenFOAM-4.x.git 
-  - git pull origin ionicWind
-  - ./Allwmake -j
-
-
 allwmake:
   stage: build
   tags:
     - openfoam4
+  cache:
+    paths:
+      - OF4IW
+  before_script:
+    - "[[ -d OF4IW/OpenFOAM-4.x ]] || git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/park0d/OpenFOAM-4.x.git OF4IW/OpenFOAM-4.x"
+    - "[[ -d OF4IW/ThirdParty-4.x ]] || git clone https://github.com/OpenFOAM/ThirdParty-4.x.git OF4IW/ThirdParty-4.x"
+    - source OF4IW/OpenFOAM-4.x/etc/bashrc
+    - cd OF4IW/OpenFOAM-4.x
+    - git remote remove origin
+    - git remote add origin https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/park0d/OpenFOAM-4.x.git
+    - git pull origin ionicWind
+    - ./Allwmake -j
   script:
     - cd ${CI_PROJECT_DIR}
     - wmake diffusivityModel
@@ -27,11 +24,16 @@ allwmake:
       - diffusivityModel/Make/*/*
     expire_in: 1 hour
 
-
 canteraTest:
   stage: test
   tags:
     - openfoam4
+  cache:
+    paths:
+      - OF4IW
+    policy: pull
+  before_script:
+    - source OF4IW/OpenFOAM-4.x/etc/bashrc
   script:
     - cd ${CI_PROJECT_DIR}
     - wmake diffusivityModel