Merge branch 'master' of github.com:ChimeraTK/JenkinsConfiguration

vars/buildTestDeploy.groovy

@@ -15,6 +15,20 @@ def call(ArrayList<String> dependencyList, String gitUrl='') {
                  'tumbleweed-Debug',
                  'tumbleweed-Release' ]
 
+  // apply changes from project-template
+  script {
+    node('Docker') {
+      sh """
+        git remote add project-template "https://github.com/ChimeraTK/project-template" || true
+        git remote update
+        git merge --no-edit project-template/master && git push origin master || true
+      """
+      // We could also apply the clang-format style here, but this should be discussed first.
+      //  find \( -name '*.cc' -o -name '*.cxx' -o -name '*.c' -o -name '*.cpp' -o -name '*.h' -o -name '*.hpp' -o -name '*.hxx' -o -name '*.hh' \) -exec clang-format-6.0 -style=file -i \{\} \;
+      //  git commit -a -m "Automated commit: apply clang-format" && git push origin master || true
+    }
+  }
+
   // only keep builds which exist for all dependencies
   script {
     node('Docker') {
@@ -56,7 +70,7 @@ def call(ArrayList<String> dependencyList, String gitUrl='') {
     options {
       disableConcurrentBuilds()
       copyArtifactPermission('*')
-      buildDiscarder(logRotator(numToKeepStr: '30', artifactNumToKeepStr: '10'))
+      buildDiscarder(logRotator(numToKeepStr: '15', artifactNumToKeepStr: '5'))
     }
 
     stages {

vars/helper.groovy

@@ -161,7 +161,12 @@ def doBuild(String label, String buildType) {
       sudo -H -u msk_jenkins mkdir -p /scratch/install
       cd /scratch/build-${JOB_NAME}
       # We might run only part of the project from a sub-directory. If it is empty the trailing / does not confuse cmake
-      sudo -H -u msk_jenkins cmake /scratch/source/${env.RUN_FROM_SUBDIR} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${buildType} -DSUPPRESS_AUTO_DOC_BUILD=true \${CMAKE_EXTRA_ARGS}
+     if [ -z "\${RUN_FROM_SUBDIR}" ]; then
+      SUBDIR=""
+     else
+      SUBDIR="${env.RUN_FROM_SUBDIR}"
+     fi
+     sudo -H -u msk_jenkins cmake /scratch/source/\${SUBDIR} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${buildType} -DSUPPRESS_AUTO_DOC_BUILD=true \${CMAKE_EXTRA_ARGS}
       sudo -H -u msk_jenkins make ${env.MAKEOPTS}
     """
   }