From 3cf9da624f430aab84eceab07526c10b05c6a738 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Tue, 8 Aug 2017 01:59:59 +0200
Subject: [PATCH] Fixing compilation of VCluster on testing machines

---
 Jenkinsfile | 4 ++--
 build.sh    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 580836f..0d47d62 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ parallel (
                     checkout scm
                     stage ('build_nyu')
                     {
-                      sh "./build.sh $WORKSPACE $NODE_NAME"
+                      sh "./build.sh $WORKSPACE $NODE_NAME $BRANCH_NAME"
                     }
 
                     stage ('run_nyu')
@@ -33,7 +33,7 @@ parallel (
                     checkout scm
                     stage ('build_sb15')
                     {
-                      sh "./build.sh $WORKSPACE $NODE_NAME NO"
+                      sh "./build.sh $WORKSPACE $NODE_NAME $BRANCH_NAME"
                     }
 
                     stage ('run_sb15')
diff --git a/build.sh b/build.sh
index 743741a..916da03 100755
--- a/build.sh
+++ b/build.sh
@@ -5,6 +5,7 @@
 echo "$PATH"
 echo "Directory: $1"
 echo "Machine: $2"
+echo "Branch: $3"
 
 mkdir /tmp/openfpm_vcluster
 mv * .[^.]* /tmp/openfpm_vcluster
@@ -17,6 +18,8 @@ git clone git@git.mpi-cbg.de:/openfpm/openfpm_data.git openfpm_data
 
 cd "$1/openfpm_vcluster"
 
+source $HOME/openfpm_vars_$3
+
 if [ "$2" == "gin" ]; then
  echo "Compiling on gin\n"
  module load gcc/4.9.2
-- 
GitLab