diff --git a/Jenkinsfile b/Jenkinsfile
index 5a5ee178f..80baf83b4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,166 +1,185 @@
 pipeline {
   parameters {string(defaultValue: '', description: 'api-token', name: 'API_TOKEN')
               string(defaultValue: '', description: 'buildable phid', name: 'BUILD_TARGET_PHID')
               string(defaultValue: '', description: 'Commit id', name: 'COMMIT_ID')
               string(defaultValue: '', description: 'Diff id', name: 'DIFF_ID')
   }
 
   options {
     disableConcurrentBuilds()
   }
 
   environment {
     PHABRICATOR_HOST = 'https://c4science.ch/api/'
     PYTHONPATH = sh returnStdout: true, script: 'echo ${WORKSPACE}/test/ci/script/'
     BLA_VENDOR = 'OpenBLAS'
     OMPI_MCA_plm = 'isolated'
     OMPI_MCA_btl = 'tcp,self'
   }
   
   agent {
     dockerfile {
       filename 'Dockerfile'
       dir 'test/ci'
       additionalBuildArgs '--tag akantu-environment'
     }
   }
   
   stages {
     stage('Lint') {
       steps {
 	sh """
            arc lint --output json --rev ${GIT_PREVIOUS_COMMIT}^1 | jq . -srM | tee lint.json
            ./test/ci/scripts/hbm send-arc-lint -f lint.json
            """
       }
     }
     stage('Configure') {
       steps {
         sh """
-        mkdir -p build
-        cd build
-        cmake -DAKANTU_COHESIVE_ELEMENT:BOOL=TRUE \
-              -DAKANTU_IMPLICIT:BOOL=TRUE \
-              -DAKANTU_PARALLEL:BOOL=TRUE \
-              -DAKANTU_PYTHON_INTERFACE:BOOL=TRUE \
-              -DAKANTU_TESTS:BOOL=TRUE .. | tee configure.txt
-        """
+           set -o pipefail
+           mkdir -p build
+           cd build
+           cmake -DAKANTU_COHESIVE_ELEMENT:BOOL=TRUE \
+                 -DAKANTU_IMPLICIT:BOOL=TRUE \
+                 -DAKANTU_PARALLEL:BOOL=TRUE \
+                 -DAKANTU_PYTHON_INTERFACE:BOOL=TRUE \
+                 -DAKANTU_TESTS:BOOL=TRUE .. | tee configure.txt
+           """
       }
       post {
 	failure {
 	  uploadArtifact('configure.txt', 'Configure')
 	  deleteDir()
 	}
       }
     }
     stage('Compile') {
       steps {
 	sh '''
-           set pipefail,errexit
+           set -o pipefail
            make -C build/src | tee compilation.txt
            '''
       }
+      post {
+	failure {
+	  uploadArtifact('compilation.txt', 'Compilation')
+	}
+      }
     }
 
     stage ('Warnings gcc') {
       steps {
         warnings(consoleParsers: [[parserName: 'GNU Make + GNU C Compiler (gcc)']])
       }
     }
 
     stage('Compile python') {
       steps {
         sh '''
-           set pipefail,errexit
+           set -o pipefail
            make -C build/python | tee compilation_python.txt
            '''
       }
+      post {
+	failure {
+	  uploadArtifact('compilation_python.txt', 'Compilation_Python')
+	}
+      }
     }
 
     stage('Compile tests') {
       steps {
         sh '''
-           set pipefail,errexit
+           set -o pipefail
            make -C build/test | tee compilation_test.txt
            '''
       }
+      post {
+	failure {
+	  uploadArtifact('compilation_test.txt', 'Compilation_Tests')
+	}
+      }
     }
 
     stage('Tests') {
       steps {
         sh '''
           #rm -rf build/gtest_reports
           cd build/
           #source ./akantu_environement.sh
         
           ctest -T test --no-compress-output || true
+        '''
+      }
+      post {
+	always {
+	  script {
+	    def TAG = sh returnStdout: true, script: 'head -n 1 < build/Testing/TAG'
+	    def TAG_ = TAG.trim()
 
-	  TAG=`head -n 1 < build/Testing/TAG`
-          if [ -e build/Testing/\${TAG}/Test.xml]; then
-            cp build/Testing/\${TAG}/Test.xml CTestResults.xml
-	  fi
-          '''
+	    if (fileExists("build/Testing/${TAG}/Test.xml")) {
+	      sh "cp build/Testing/${TAG}/Test.xml CTestResults.xml"
+	    }
+	  }
+	}
       }
     }
   }
 
   post {
     always {
-      uploadArtifact('compilation.txt', 'Compilation')
-      uploadArtifact('compilation_python.txt', 'Compilation_Python')
-      uploadArtifact('compilation_test.txt', 'Compilation_Tests')
-      
       createArtifact("./CTestResults.xml")
       
       step([$class: 'XUnitBuilder',
 	    thresholds: [
           [$class: 'SkippedThreshold', failureThreshold: '0'],
           [$class: 'FailedThreshold', failureThreshold: '0']],
 	    tools: [
 	  [$class: 'CTestType', pattern: 'CTestResults.xml', skipNoTestFiles: true]
 	]])
 
       // step([$class: 'XUnitBuilder',
       //       thresholds: [
       //     [$class: 'SkippedThreshold', failureThreshold: '100'],
       //     [$class: 'FailedThreshold', failureThreshold: '0']],
       //       tools: [
       // 	  [$class: 'GoogleTestType', pattern: 'build/gtest_reports/**', skipNoTestFiles: true]
       // 	]])
     }
 
     success {
       passed()
     }
 
     failure {
       // emailext(
       //   body: '''${SCRIPT, template="groovy-html.template"}''',
       // 	mimeType: 'text/html',
       //   subject: "[Jenkins] ${currentBuild.fullDisplayName} Failed",
       // 	recipientProviders: [[$class: 'CulpritsRecipientProvider']],
       // 	to: 'akantu-admins@akantu.ch',
       // 	replyTo: 'akantu-admins@akantu.ch',
       // 	attachLog: true,
       //   compressLog: false)
       failed()
     }
   }
 }
 
 def failed() {
   sh "./test/ci/scripts/hbm failed"
 }
 
 def passed() {
   sh "./test/ci/scripts/hbm passed"
 }
 
 def createArtifact(artifact) {
   sh "./test/ci/scripts/hbm send-uri -k 'Jenkins URI' -u ${BUILD_URL} -l 'View Jenkins result'"
   sh "./test/ci/scripts/hbm send-ctest-results -f ${artifact}"
 }
 
 def uploadArtifact(name, artifact) {
   sh "./test/ci/scripts/hbm upload-file -f ${artifact} -n \"${name}\" -v PHID-PROJ-5eqyu6ooyjktagbhf473"
 }