diff --git a/Jenkinsfile b/Jenkinsfile index a70f092bca32cd70b25c6b38499b1c358122b05e..c2c8bbd8b4112428e6c9fd9beddbe21d76d8b3af 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 c42e2f57d26313599da1ec6a0961519ee91e79ec..f0ebd27edc42c9c50a5ba79349825e28a4a93e76 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 )