From e303749203de3a578fc9a6d50c239d9fce526b8d Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Sat, 1 Dec 2018 19:35:56 +0100
Subject: [PATCH] Latest modules
---
Jenkinsfile_numerics_mpi | 6 +++---
build.sh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile_numerics_mpi b/Jenkinsfile_numerics_mpi
index 8fce3aae6..3ebb1ded2 100644
--- a/Jenkinsfile_numerics_mpi
+++ b/Jenkinsfile_numerics_mpi
@@ -24,7 +24,7 @@ parallel (
stage ('build_centos')
{
- sh "./build.sh $WORKSPACE $NODE_NAME numerics numerics 0"
+ sh "./build.sh $WORKSPACE $NODE_NAME numerics numerics $BRANCH_NAME"
}
stage ('run_gin')
@@ -65,7 +65,7 @@ parallel (
stage ('build mac')
{
- sh "./build.sh $WORKSPACE $NODE_NAME numerics numerics 0"
+ sh "./build.sh $WORKSPACE $NODE_NAME numerics numerics $BRANCH_NAME"
}
stage ('run mac')
@@ -103,7 +103,7 @@ parallel (
stage ('build ubuntu')
{
- sh "./build.sh $WORKSPACE $NODE_NAME numerics numerics 0"
+ sh "./build.sh $WORKSPACE $NODE_NAME numerics numerics $BRANCH_NAME"
}
stage ('run ubuntu')
diff --git a/build.sh b/build.sh
index 7f9b0f462..cf8968632 100755
--- a/build.sh
+++ b/build.sh
@@ -14,9 +14,9 @@ echo "make target: $target"
echo "compilation type: $comp_type"
echo "Branch name: $branch"
+rm -rf $HOME/openfpm_dependencies/openfpm_pdata/0
if [ x"$hostname" == x"cifarm-centos-node.mpi-cbg.de" ]; then
- #we retest PETSC installation
./install_MPI_mpich.sh $HOME/openfpm_dependencies/openfpm_pdata/$branch/ 4
echo 4 > $HOME/openfpm_dependencies/openfpm_pdata/$branch/MPI/version
fi
--
GitLab