From d80bf6f2bdb94e0cf954a82ec41cb76b177181ae Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 8 Jan 2019 12:37:33 +0100
Subject: [PATCH] [Jenkins] Use NUM_THREADS env var for parallel compilation.
Use NUM_THREADS also for ctest parallelism.
https://github.com/ufz/jenkins-pipeline-library/commit/0f48380b1523fc626a72d3e85795aa94de29985e
---
Jenkinsfile | 4 ++--
scripts/cmake/test/Test.cmake | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0050e7c813a..7d38600aba2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
-@Library('jenkins-pipeline@1.0.13') _
+@Library('jenkins-pipeline@1.0.15') _
def stage_required = [build: false, data: false, full: false, docker: false]
@@ -114,7 +114,7 @@ pipeline {
// TODO: .*DOT_GRAPH_MAX_NODES.
// .*potential recursive class relation.*
recordIssues tools: [doxygen(pattern: 'build/DoxygenWarnings.log')],
- unstableTotalAll: 24
+ unstableTotalAll: 25
}
success {
publishHTML(target: [allowMissing: false, alwaysLinkToLastBuild: true,
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index c2c82e9f3a9..249936dcf8c 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -37,7 +37,11 @@ configure_file(
include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/AddTest.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/OgsTest.cmake)
-set(NUM_CTEST_PROCESSORS 3)
+if(DEFINED ENV{NUM_THREADS})
+ set(NUM_CTEST_PROCESSORS $ENV{NUM_THREADS})
+else()
+ set(NUM_CTEST_PROCESSORS 3)
+endif()
if(CMAKE_CONFIGURATION_TYPES)
set(CONFIG_PARAMETER --build-config "$<CONFIGURATION>")
--
GitLab