From 368f122b8ff4f05360ea10ddfae9df783e417211 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 19 Jul 2017 21:25:11 +0200
Subject: [PATCH] [Jenkins] Run ctest-large sequentially.
- Do not run in parallel with unit tests
- ctest-large target run tests sequentially
---
scripts/cmake/test/Test.cmake | 2 +-
scripts/jenkins/gcc-tests-large.groovy | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index f8671a88a73..658448b8a6d 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -55,7 +55,7 @@ add_custom_target(
COMMAND ${CMAKE_CTEST_COMMAND} -T Test
--force-new-ctest-process
--output-on-failure --output-log Tests/ctest-large.log
- ${CONFIG_PARAMETER} --parallel ${NUM_PROCESSORS} --test-action test
+ ${CONFIG_PARAMETER} --test-action test
DEPENDS ogs vtkdiff ctest-large-cleanup
)
add_custom_target(
diff --git a/scripts/jenkins/gcc-tests-large.groovy b/scripts/jenkins/gcc-tests-large.groovy
index e1e68b70f30..c267a9ce2f4 100644
--- a/scripts/jenkins/gcc-tests-large.groovy
+++ b/scripts/jenkins/gcc-tests-large.groovy
@@ -16,9 +16,12 @@ node('envinf11w') {
def image = docker.image('ogs6/gcc-gui:latest')
image.pull()
image.inside(defaultDockerArgs) {
- stage('Configure') { configure.linux(cmakeOptions: defaultCMakeOptions, script: this) }
+ stage('Configure') { configure.linux(cmakeOptions: defaultCMakeOptions,
+ script: this) }
stage('Build') { build.linux(script: this) }
- stage('Test') { build.linux(script: this, target: 'tests ctest-large') }
+ stage('Test') { build.linux(cmd: 'make -j 1'
+ script: this,
+ target: 'tests ctest-large') }
}
stage('Post') {
--
GitLab