From b6402e84d669cf0801881d799da755a377a914e9 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 18 Dec 2025 14:41:27 +0100 Subject: [PATCH 1/2] jenkins build script: remove support for CTEST_CONFIGURATION this was used when sca tools ran in the build system. no longer useful, remove to (slightly) decrease complexity --- jenkins/build-opm-module.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/jenkins/build-opm-module.sh b/jenkins/build-opm-module.sh index 5829c768b3d..1761d8762d0 100755 --- a/jenkins/build-opm-module.sh +++ b/jenkins/build-opm-module.sh @@ -126,12 +126,7 @@ function build_module { fi test $? -eq 0 || exit 2 TESTTHREADS=${TESTTHREADS:-1} - if test -z "$CTEST_CONFIGURATION" - then - ctest -T Test --no-compress-output -j$TESTTHREADS -LE "gpu_.*" - else - ctest -j$TESTTHREADS -C $CTEST_CONFIGURATION --timeout 5000 -T Test --no-compress-output -LE "gpu_.*" - fi + ctest -T Test --no-compress-output -j$TESTTHREADS -LE "gpu_.*" # Convert to junit format $WORKSPACE/deps/opm-common/jenkins/convert.py -x $WORKSPACE/deps/opm-common/jenkins/conv.xsl -t . > testoutput.xml From 8bc4f01ab79e44ce0d1785ae41850c5bca8a6de5 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 18 Dec 2025 14:42:51 +0100 Subject: [PATCH 2/2] jenkins build script: make ctest timeout configurable --- jenkins/build-opm-module.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jenkins/build-opm-module.sh b/jenkins/build-opm-module.sh index 1761d8762d0..e2a347b8261 100755 --- a/jenkins/build-opm-module.sh +++ b/jenkins/build-opm-module.sh @@ -126,7 +126,14 @@ function build_module { fi test $? -eq 0 || exit 2 TESTTHREADS=${TESTTHREADS:-1} - ctest -T Test --no-compress-output -j$TESTTHREADS -LE "gpu_.*" + if test -n "${CTEST_TIMEOUT}" + then + TIMEOUT="--timeout ${CTEST_TIMEOUT}" + else + TIMEOUT="" + fi + + ctest -T Test --no-compress-output -j$TESTTHREADS -LE "gpu_.*" ${TIMEOUT} # Convert to junit format $WORKSPACE/deps/opm-common/jenkins/convert.py -x $WORKSPACE/deps/opm-common/jenkins/conv.xsl -t . > testoutput.xml