diff --git a/Jenkinsfile b/Jenkinsfile index 0d47d62f901f7c384b2446094abdcea59cf9d948..042927a6f2bf065bdb8bf27c78fe1b09ef268090 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 7b7748e484e308cbab42524962d8f4936427618b..003a4a8ee3bc58ccbe12d6cbef34e3f75602071f 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