From 17faab2e9524e25b09cd7dd73779c32e24c97e52 Mon Sep 17 00:00:00 2001
From: Yeongdo Park <ignis@postech.ac.kr>
Date: Sun, 9 Dec 2018 17:43:09 -0500
Subject: [PATCH] Revert "remove openfoam build command in test job"

This reverts commit 6bb89d8efc919f219ea8643a412c2965b04ae4fd.
---
 .gitlab-ci.yml | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d7f5f9..525651f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,24 @@
 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
@@ -24,16 +27,11 @@ 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