diff --git a/Jenkinsfile b/Jenkinsfile
index 46f4792..8b81c96 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,215 +1,206 @@
 pipeline {
     parameters {string(defaultValue: '', description: 'api-token', name: 'API_TOKEN')
 	            string(defaultValue: '', description: 'buildable phid', name: 'TARGET_PHID')
 	            string(defaultValue: 'docker_debian_testing', description: 'docker file to use', name: 'DOCKERFILE')
                 string(defaultValue: '', description: 'Commit id', name: 'COMMIT_ID')
     }
 
     agent none
 
     environment {
         OMPI_MCA_plm = 'isolated'
         OMPI_MCA_btl = 'tcp,self'
     }
     options {
         disableConcurrentBuilds()
     }
     stages {
         stage ('wipe build') {
             agent any
             when {
                 anyOf{
                     changeset glob: "**/*.cmake"
                     changeset glob: "**/CMakeLists.txt"
 
                 }
             }
             steps {
                 sh ' rm -rf build_*'
             }
         }
         stage ('configure') {
             parallel {
                 stage ('docker_debian_testing') {
                     agent {
                         dockerfile {
                             filename 'docker_debian_testing'
                             dir 'dockerfiles'
                         }
                     }
                     steps {
                         configure('docker_debian_testing')
                     }
                 }
                 stage ('docker_debian_stable') {
                     agent {
                         dockerfile {
                             filename 'docker_debian_stable'
                             dir 'dockerfiles'
                         }
                     }
                     steps {
                         configure('docker_debian_stable')
                     }
                 }
             }
         }
         stage ('build') {
             parallel {
                 stage ('docker_debian_testing') {
                     agent {
                         dockerfile {
                             filename 'docker_debian_testing'
                             dir 'dockerfiles'
                         }
                     }
                     steps {
                         build('docker_debian_testing')
                     }
                 }
                 stage ('docker_debian_stable') {
                     agent {
                         dockerfile {
                             filename 'docker_debian_stable'
                             dir 'dockerfiles'
                         }
                     }
                     steps {
                         build('docker_debian_stable')
                     }
                 }
             }
         }
 
 
         stage ('Warnings gcc') {
             steps {
                 warnings(consoleParsers: [[parserName: 'GNU Make + GNU C Compiler (gcc)']])
             }
         }
 
         stage ('test') {
             parallel {
                 stage ('docker_debian_testing') {
                     agent {
                         dockerfile {
                             filename 'docker_debian_testing'
                             dir 'dockerfiles'
                         }
                     }
                     steps {
                         sh '''#!/bin/bash
 CONTAINER_NAME=docker_debian_testing
 BUILD_DIR=build_${CONTAINER_NAME}
 for CXX_COMPILER in g++ clang++
 do
     cd ${BUILD_DIR}_${CXX_COMPILER}
     ctest || true
     mkdir -p ../test_results
     ##mv test_results*.xml ../test_results
 done
                      '''
                     }
                 }
                 stage ('docker_debian_stable') {
                     agent {
                         dockerfile {
                             filename 'docker_debian_stable'
                             dir 'dockerfiles'
                         }
                     }
                     steps {
                         sh '''#!/bin/bash
 CONTAINER_NAME=docker_debian_stable
 BUILD_DIR=build_${CONTAINER_NAME}
 for CXX_COMPILER in g++ clang++
 do
     cd ${BUILD_DIR}_${CXX_COMPILER}
     ctest || true
     mkdir -p ../test_results
     ##mv test_results*.xml ../test_results
 done
                      '''
                     }
                 }
             }
         }
     }
 
 
     post {
         always {
             junit '**/test_results*.xml'
             sh 'rm -rf test_results/*'
             sh ''' set +x
 ##                python3 -c "import os; import json; msg = {'buildTargetPHID':  os.environ['TARGET_PHID'],
 ##                                                                'artifactKey': 'Jenkins URI {}'.format(os.environ['CXX_COMPILER']),
 ##                                                                'artifactType': 'uri',
 ##                                                                'artifactData': {
 ##                                                                    'uri': os.environ['BUILD_URL'],
 ##                                                                    'name': 'View Jenkins results for {}'.format(os.environ['CXX_COMPILER']),
 ##                                                                    'ui.external': True
 ##                                                                    }
 ##                     }; print(json.dumps(msg))" | arc call-conduit --conduit-uri https://c4science.ch/ --conduit-token ${API_TOKEN} harbormaster.createartifact
 curl https://c4science.ch/api/harbormaster.createartifact \
 -d api.token=${API_TOKEN} \
 -d buildTargetPHID=${TARGET_PHID} \
 -d artifactKey="Jenkins URI" \
 -d artifactType=uri \
 -d artifactData[uri]=${BUILD_URL} \
 -d artifactData[name]="View Jenkins result" \
 -d artifactData[ui.external]=1
 '''
         }
 
 	    success {
             sh '''
                   set +x
 #python3 -c "import os; import json; msg = {'buildTargetPHID': os.environ['TARGET_PHID'], 'type':'pass'}; print(json.dumps(msg))" | arc call-conduit --conduit-uri https://c4science.ch/ --conduit-token ${API_TOKEN} harbormaster.sendmessage
 curl https://c4science.ch/api/harbormaster.sendmessage \
 -d api.token=${API_TOKEN} \
 -d buildTargetPHID=${TARGET_PHID} \
 -d type="pass"
                   '''
         }
 
 	    failure {
             sh '''
                   set +x
 #                  python3 -c "import os; import json; msg = {'buildTargetPHID': os.environ['TARGET_PHID'], 'type':'fail'}; print(json.dumps(msg))" | arc call-conduit --conduit-uri https://c4science.ch/ --conduit-token ${API_TOKEN} harbormaster.sendmessage
 curl https://c4science.ch/api/harbormaster.sendmessage \
 -d api.token=${API_TOKEN} \
 -d buildTargetPHID=${TARGET_PHID} \
 -d type="fail"
                   '''
         }
     }
 }
 
 
 def configure(container_name) {
-    echo "$container_name"
-    echo '$container_name'
-    sh """#!/bin/bash
-BUILD_DIR=build_${container_name}
-for CXX_COMPILER in g++ clang++
-do
-    mkdir -p ${BUILD_DIR}_${CXX_COMPILER}
-    cd ${BUILD_DIR}_${CXX_COMPILER}
-    CXX=${CXX_COMPILER} cmake -DCMAKE_BUILD_TYPE:STRING=Release -DRUNNING_IN_CI=ON ..
-    cd ..
-done
+    BUILD_DIR = "build_${container_name}"
+    for (CXX_COMPILER in ["g++", "clang++"]) {
+        sh """
+mkdir -p ${BUILD_DIR}_${CXX_COMPILER}
+cd ${BUILD_DIR}_${CXX_COMPILER}
+CXX=${CXX_COMPILER} cmake -DCMAKE_BUILD_TYPE:STRING=Release -DRUNNING_IN_CI=ON ..
 """
+    }
 }
 
 def build(container_name) {
-    echo "$container_name"
-    echo '$container_name'
-    sh """#!/bin/bash
-BUILD_DIR=build_${container_name}
-for CXX_COMPILER in g++ clang++
-do
-    make -C ${BUILD_DIR}_${CXX_COMPILER}
-done
-"""
+    BUILD_DIR = "build_${container_name}"
+    for (CXX_COMPILER in ["g++", "clang++"]) {
+        sh "make -C ${BUILD_DIR}_${CXX_COMPILER}"
+    }
 }