Commit 66b1dbfb authored by incardon's avatar incardon

Fixing jenkins file

parent ebf878f8
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
parallel ( parallel (
"cifarm-ubuntu" : {node ('cifarm-ubuntu') "cifarm-ubuntu-node" : {node ('cifarm-ubuntu-node')
{ {
deleteDir() deleteDir()
...@@ -45,7 +45,6 @@ parallel ( ...@@ -45,7 +45,6 @@ parallel (
"cifarm-mac-node" : {node ('cifarm-mac-node') "cifarm-mac-node" : {node ('cifarm-mac-node')
{ {
deleteDir() deleteDir()
env.PATH = "/usr/local/bin:${env.PATH}"
int ntry = 5 int ntry = 5
while (ntry != 0) while (ntry != 0)
...@@ -87,7 +86,6 @@ parallel ( ...@@ -87,7 +86,6 @@ parallel (
"cifarm-centos-node" : {node ('cifarm-centos-node') "cifarm-centos-node" : {node ('cifarm-centos-node')
{ {
deleteDir() deleteDir()
env.PATH = "/usr/local/bin:${env.PATH}"
int ntry = 5 int ntry = 5
while (ntry != 0) while (ntry != 0)
......
...@@ -16,17 +16,12 @@ echo "Branch name: $branch" ...@@ -16,17 +16,12 @@ echo "Branch name: $branch"
exit 1 exit 1
if [ x"$hostname" == x"ubuntu" ]; then if [ x"$hostname" == x"cifarm-ubuntu-node" ]; then
# rm -rf $HOME/openfpm_dependencies/openfpm_pdata/$6/*
# ./script/install_MPI.sh $HOME/openfpm_dependencies/openfpm_pdata/$6/ 8
export PATH="$HOME/openfpm_dependencies/openfpm_pdata/$6/MPI/bin/:$PATH" export PATH="$HOME/openfpm_dependencies/openfpm_pdata/$6/MPI/bin/:$PATH"
fi fi
#if [ x"$hostname" == x"osx" ]; then
# rm -rf $HOME/openfpm_dependencies/openfpm_pdata/$6/OPENBLAS
#fi
if [ x"$6" == x"" ]; then if [ x"$branch" == x"" ]; then
branch=$(git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3) branch=$(git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3)
else else
branch=$6 branch=$6
......
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