diff --git a/Jenkinsfile_examples_test b/Jenkinsfile_examples_test index 9cb9fb27b24c57f6d98fcee5847965fdf4ee68ac..abd390c12b0efff3b8aabe342d5cae656f9d0b01 100644 --- a/Jenkinsfile_examples_test +++ b/Jenkinsfile_examples_test @@ -8,7 +8,7 @@ parallel ( checkout scm stage ('build_gin') { - sh "./build.sh $WORKSPACE $NODE_NAME pdata && make install" + sh "./build.sh $WORKSPACE $NODE_NAME pdata full && make install" } stage ('run_example_gin') @@ -24,7 +24,7 @@ parallel ( env.PATH = "/usr/local/bin:${env.PATH}" stage ('build_sb15') { - sh "./build.sh $WORKSPACE $NODE_NAME pdata && make install" + sh "./build.sh $WORKSPACE $NODE_NAME pdata full && make install" } stage ('run_example_sb15') diff --git a/build.sh b/build.sh index 2b2634878a920f9060fbaeaa40a9078102534b9c..c6e02a6af4d09749e0eebef1aa58223e524ddfb1 100755 --- a/build.sh +++ b/build.sh @@ -27,8 +27,12 @@ then echo "Compiling on gin\n" source ~/.bashrc module load gcc/4.9.2 - ./install -m -s -c "--prefix=/home/jenkins/openfpm_install" - make $3 + if [ x"$4" == x"full" ]; then + ./install -s -c "--prefix=/home/jenkins/openfpm_install" + else + ./install -m -s -c "--prefix=/home/jenkins/openfpm_install" + make $4 + fi 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 ; @@ -36,10 +40,6 @@ then source $HOME/openfpm_vars - if [ x"$3" == x"no_test" ]; then - exit 0; - fi - 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 ; @@ -92,17 +92,19 @@ then else echo "Compiling general" source ~/.bashrc - ./install -m -s -c"--prefix=/Users/jenkins/openfpm_install" - make $3 + + if [ x"$4" == x"full" ]; then + ./install -s -c "--prefix=/Users/jenkins/openfpm_install" + else + ./install -m -s -c "--prefix=/Users/jenkins/openfpm_install" + make $4 + fi 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 - if [ x"$3" == x"no_test" ]; then - exit 0; - fi fi curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Info:\", \"color\": \"#00FF00\", \"text\":\"$2 completed succeffuly the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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