Fixing multibranch pipeline

Jenkinsfile

@@ -15,9 +15,9 @@ parallel (
                     stage ('run_nyu')
                     {
                       parallel (
-                      "1" : {sh "./run.sh $WORKSPACE $NODE_NAME 1"},
-                      "2" : {sh "./run.sh $WORKSPACE $NODE_NAME 2"},
-                      "3" : {sh "./run.sh $WORKSPACE $NODE_NAME 3"})
+                      "1" : {sh "./run.sh $WORKSPACE $NODE_NAME 1 0 0  $BRANCH_NAME"},
+                      "2" : {sh "./run.sh $WORKSPACE $NODE_NAME 2 0 0  $BRANCH_NAME"},
+                      "3" : {sh "./run.sh $WORKSPACE $NODE_NAME 3 0 0  $BRANCH_NAME"})
                       sh "./run.sh $WORKSPACE $NODE_NAME 5"
                       sh "./success.sh 2 nyu opefpm_pdata"
                     }
@@ -40,9 +40,9 @@ parallel (
                     stage ('run_sb15')
                     {
                       parallel (
-                      "1" : {sh "./run.sh $WORKSPACE $NODE_NAME 1"},
-                      "2" : {sh "./run.sh $WORKSPACE $NODE_NAME 2"},
-                      "3" : {sh "./run.sh $WORKSPACE $NODE_NAME 3"}
+                      "1" : {sh "./run.sh $WORKSPACE $NODE_NAME 1 0 0  $BRANCH_NAME"},
+                      "2" : {sh "./run.sh $WORKSPACE $NODE_NAME 2 0 0  $BRANCH_NAME"},
+                      "3" : {sh "./run.sh $WORKSPACE $NODE_NAME 3 0 0  $BRANCH_NAME"}
                       )
                       sh "./run.sh $WORKSPACE $NODE_NAME 4"
                       sh "./run.sh $WORKSPACE $NODE_NAME 5"
@@ -67,10 +67,10 @@ parallel (
                     stage ('run_gin')
                     {
                       parallel (
-                      "p1" : {sh "./run.sh $WORKSPACE $NODE_NAME 1"},
-                      "p2" : {sh "./run.sh $WORKSPACE $NODE_NAME 2"},
-                      "p3" : {sh "./run.sh $WORKSPACE $NODE_NAME 3"},
-                      "p4" : {sh "./run.sh $WORKSPACE $NODE_NAME 5"}
+                      "p1" : {sh "./run.sh $WORKSPACE $NODE_NAME 1 0 0  $BRANCH_NAME"},
+                      "p2" : {sh "./run.sh $WORKSPACE $NODE_NAME 2 0 0  $BRANCH_NAME"},
+                      "p3" : {sh "./run.sh $WORKSPACE $NODE_NAME 3 0 0  $BRANCH_NAME"},
+                      "p4" : {sh "./run.sh $WORKSPACE $NODE_NAME 5 0 0  $BRANCH_NAME"}
                       )
                       sh "./success.sh 2 gin opefpm_pdata"
                     }

run.sh

@@ -4,6 +4,7 @@
 
 echo "Directory: $1"
 echo "Machine: $2"
+echo "Branch: $6"
 
 if [ "$2" == "gin" ]
 then
@@ -14,7 +15,7 @@ then
    exit 1 ;
  fi
 
- source $HOME/openfpm_vars
+ source $HOME/openfpm_vars_$6
 
  if [ x"$3" == x"no_test" ]; then
    exit 0;
@@ -26,25 +27,6 @@ then
    exit 1 ;
  fi
 
-elif [ "$2" == "wetcluster" ]
-then
- echo "Compiling on wetcluster"
-
-## produce the module path
-
- source ~/.bashrc
- module load gcc/4.9.2
- module load openmpi/1.8.1
- module load boost/1.54.0
-
- source $HOME/openfpm_vars
-
- ## Run on the cluster
- bsub -o output_run$3.%J -K -n 2 -R "span[hosts=$4]" "module load openmpi/1.8.1 ; module load gcc/4.9.2; module load boost/1.54.0;  mpirun -np $3 ./src/pdata"
- if [ $? -ne 0 ]; then 
-   curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\"  , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$2 failed to complete the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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
-   exit 1 ; 
- fi
 elif [ "$2" == "taurus" ]
 then
 
@@ -59,7 +41,7 @@ then
  
  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/home/incard/PARMETIS/lib:/home/incard/METIS/lib:/home/incard/HDF5/lib"
 
- source $HOME/openfpm_vars
+ source $HOME/openfpm_vars_$6
 
  salloc --nodes=$4 --ntasks-per-node=$5 --time=00:15:00 --mem-per-cpu=1900 --partition=haswell bash -c "ulimit -s unlimited && mpirun -np $3 src/pdata --report_level=no"
  if [ $? -ne 0 ]; then
@@ -74,7 +56,7 @@ else
    exit 0;
  fi
 
- source $HOME/openfpm_vars
+ source $HOME/openfpm_vars_$6
 
  mpirun -np $3 ./src/pdata
  if [ $? -ne 0 ]; then