From 52f4a949e833c3f18a487dcc03a14ddbd026e7fe Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 14 Feb 2019 13:55:47 +0100
Subject: [PATCH] [Jenkins] Large tests run on envinf56 too and increased
timeout to 1 h.
The timeout is maximum runtime for one benchmark. Was 15 minutes before.
---
Jenkinsfile | 2 +-
scripts/cmake/test/Test.cmake | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a70f092bca3..c2c8bbd8b41 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -411,7 +411,7 @@ pipeline {
dockerfile {
filename 'Dockerfile.gcc.full'
dir 'scripts/docker'
- label 'envinf11w'
+ label 'envinf11w || envinf56'
args '-v /home/jenkins/cache/ccache:/opt/ccache -v /home/jenkins/cache/conan/.conan:/opt/conan/.conan'
additionalBuildArgs '--pull'
}
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index c42e2f57d26..f0ebd27edc4 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -87,6 +87,7 @@ add_custom_target(
--output-on-failure --output-log Tests/ctest-large.log
--tests-regex LARGE
${CONFIG_PARAMETER} --parallel ${NUM_CTEST_PROCESSORS}
+ --timeout 3600
DEPENDS ogs vtkdiff ctest-large-cleanup
USES_TERMINAL
)
@@ -101,6 +102,7 @@ add_custom_target(
--output-on-failure --output-log Tests/ctest-large.log
--tests-regex LARGE
${CONFIG_PARAMETER}
+ --timeout 3600
DEPENDS ogs vtkdiff ctest-large-cleanup
USES_TERMINAL
)
--
GitLab