From 437db9dc91bacbb9c460b734cdc8d0c439d06b49 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Tue, 8 Aug 2017 02:08:34 +0200
Subject: [PATCH] Fixing run

---
 Jenkinsfile | 20 ++++++++++----------
 run.sh      |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0d47d62..042927a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,10 +14,10 @@ parallel (
 
                     stage ('run_nyu')
                     {
-                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 2"
-                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 3"
-                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 4"
-                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 5"
+                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 2 $BRANCH_NAME"
+                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 3 $BRANCH_NAME"
+                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 4 $BRANCH_NAME"
+                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 5 $BRANCH_NAME"
                       sh "cd openfpm_vcluster && ./success.sh 2 nyu openfpm_vcluster"
                     }
                   }
@@ -38,12 +38,12 @@ parallel (
 
                     stage ('run_sb15')
                     {
-                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 2"
-                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 3"
-                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 4"
-                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 5"
-                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 6"
-                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 7"
+                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 2 $BRANCH_NAME"
+                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 3 $BRANCH_NAME"
+                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 4 $BRANCH_NAME"
+                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 5 $BRANCH_NAME"
+                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 6 $BRANCH_NAME"
+                      sh "cd openfpm_vcluster && ./run.sh $WORKSPACE $NODE_NAME 7 $BRANCH_NAME"
                       sh "cd openfpm_vcluster && ./success.sh 2 sbalzarini-mac-15 openfpm_vcluster"
                     }
                   }
diff --git a/run.sh b/run.sh
index 7b7748e..003a4a8 100755
--- a/run.sh
+++ b/run.sh
@@ -5,8 +5,10 @@
 echo "$PATH"
 echo "Directory: $1"
 echo "Machine: $2"
+echo "Branch: $4"
 
 cd "$1/openfpm_vcluster"
+source $HOME/openfpm_vars_$4
 
 if [ "$2" == "wetcluster" ]; then
 
-- 
GitLab