Commit ab003fac authored by incardon's avatar incardon

Fixing multibranch pipeline

parent 327672e3
...@@ -15,9 +15,9 @@ parallel ( ...@@ -15,9 +15,9 @@ parallel (
stage ('run_nyu') stage ('run_nyu')
{ {
parallel ( parallel (
"1" : {sh "./run.sh $WORKSPACE $NODE_NAME 1"}, "1" : {sh "./run.sh $WORKSPACE $NODE_NAME 1 0 0 $BRANCH_NAME"},
"2" : {sh "./run.sh $WORKSPACE $NODE_NAME 2"}, "2" : {sh "./run.sh $WORKSPACE $NODE_NAME 2 0 0 $BRANCH_NAME"},
"3" : {sh "./run.sh $WORKSPACE $NODE_NAME 3"}) "3" : {sh "./run.sh $WORKSPACE $NODE_NAME 3 0 0 $BRANCH_NAME"})
sh "./run.sh $WORKSPACE $NODE_NAME 5" sh "./run.sh $WORKSPACE $NODE_NAME 5"
sh "./success.sh 2 nyu opefpm_pdata" sh "./success.sh 2 nyu opefpm_pdata"
} }
...@@ -40,9 +40,9 @@ parallel ( ...@@ -40,9 +40,9 @@ parallel (
stage ('run_sb15') stage ('run_sb15')
{ {
parallel ( parallel (
"1" : {sh "./run.sh $WORKSPACE $NODE_NAME 1"}, "1" : {sh "./run.sh $WORKSPACE $NODE_NAME 1 0 0 $BRANCH_NAME"},
"2" : {sh "./run.sh $WORKSPACE $NODE_NAME 2"}, "2" : {sh "./run.sh $WORKSPACE $NODE_NAME 2 0 0 $BRANCH_NAME"},
"3" : {sh "./run.sh $WORKSPACE $NODE_NAME 3"} "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 4"
sh "./run.sh $WORKSPACE $NODE_NAME 5" sh "./run.sh $WORKSPACE $NODE_NAME 5"
...@@ -67,10 +67,10 @@ parallel ( ...@@ -67,10 +67,10 @@ parallel (
stage ('run_gin') stage ('run_gin')
{ {
parallel ( parallel (
"p1" : {sh "./run.sh $WORKSPACE $NODE_NAME 1"}, "p1" : {sh "./run.sh $WORKSPACE $NODE_NAME 1 0 0 $BRANCH_NAME"},
"p2" : {sh "./run.sh $WORKSPACE $NODE_NAME 2"}, "p2" : {sh "./run.sh $WORKSPACE $NODE_NAME 2 0 0 $BRANCH_NAME"},
"p3" : {sh "./run.sh $WORKSPACE $NODE_NAME 3"}, "p3" : {sh "./run.sh $WORKSPACE $NODE_NAME 3 0 0 $BRANCH_NAME"},
"p4" : {sh "./run.sh $WORKSPACE $NODE_NAME 5"} "p4" : {sh "./run.sh $WORKSPACE $NODE_NAME 5 0 0 $BRANCH_NAME"}
) )
sh "./success.sh 2 gin opefpm_pdata" sh "./success.sh 2 gin opefpm_pdata"
} }
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
echo "Directory: $1" echo "Directory: $1"
echo "Machine: $2" echo "Machine: $2"
echo "Branch: $6"
if [ "$2" == "gin" ] if [ "$2" == "gin" ]
then then
...@@ -14,7 +15,7 @@ then ...@@ -14,7 +15,7 @@ then
exit 1 ; exit 1 ;
fi fi
source $HOME/openfpm_vars source $HOME/openfpm_vars_$6
if [ x"$3" == x"no_test" ]; then if [ x"$3" == x"no_test" ]; then
exit 0; exit 0;
...@@ -26,25 +27,6 @@ then ...@@ -26,25 +27,6 @@ then
exit 1 ; exit 1 ;
fi 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" ] elif [ "$2" == "taurus" ]
then then
...@@ -59,7 +41,7 @@ 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" 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" 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 if [ $? -ne 0 ]; then
...@@ -74,7 +56,7 @@ else ...@@ -74,7 +56,7 @@ else
exit 0; exit 0;
fi fi
source $HOME/openfpm_vars source $HOME/openfpm_vars_$6
mpirun -np $3 ./src/pdata mpirun -np $3 ./src/pdata
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment