From 699800f14260c47bca4b69fe656b50371dad46d7 Mon Sep 17 00:00:00 2001 From: Andre Sailer <andre.philippe.sailer@cern.ch> Date: Mon, 31 Mar 2025 17:37:42 +0200 Subject: [PATCH] Revert "CDash: disable ssl verification" This reverts commit 676c99ab7e490f3ed60117ddc5b24a2862ec27ba. --- jenkins/Jenkinsfunctions.groovy | 2 +- jenkins/lcgcmake-common.cmake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jenkins/Jenkinsfunctions.groovy b/jenkins/Jenkinsfunctions.groovy index 1752f2d3a4..3ec2322531 100644 --- a/jenkins/Jenkinsfunctions.groovy +++ b/jenkins/Jenkinsfunctions.groovy @@ -406,7 +406,7 @@ def testPythonImport() { exit_code=\$? testxml=\$WORKSPACE/Test.xml checksum=\$(md5sum \$testxml | cut -d ' ' -f 1) - curl --insecure --max-time 120 -s --upload-file \$testxml "https://lcgapp-cdash-2.cern.ch/submit.php?project=LCGSoft&FileName=${BUILDHOSTNAME}___${LCG_VERSION}-${urlPLATFORM}___\${CTEST_TIMESTAMP}-\${MODE}___XML___Test.xml&build=${LCG_VERSION}-${urlPLATFORM}&site=${BUILDHOSTNAME}&stamp=\${CTEST_TIMESTAMP}-\${MODE}&MD5=\${checksum}" || echo "Timeout is OK" + curl --max-time 120 -s --upload-file \$testxml "http://lcgapp-cdash-2.cern.ch/submit.php?project=LCGSoft&FileName=${BUILDHOSTNAME}___${LCG_VERSION}-${urlPLATFORM}___\${CTEST_TIMESTAMP}-\${MODE}___XML___Test.xml&build=${LCG_VERSION}-${urlPLATFORM}&site=${BUILDHOSTNAME}&stamp=\${CTEST_TIMESTAMP}-\${MODE}&MD5=\${checksum}" || echo "Timeout is OK" exit \$exit_code """ } diff --git a/jenkins/lcgcmake-common.cmake b/jenkins/lcgcmake-common.cmake index 5036cf1a33..6e1ab8de0d 100644 --- a/jenkins/lcgcmake-common.cmake +++ b/jenkins/lcgcmake-common.cmake @@ -31,8 +31,7 @@ endif() #---CDash settings---------------------------------------------------------- set(CTEST_PROJECT_NAME "LCGSoft") set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC") -set(CTEST_CURL_OPTIONS CURLOPT_SSL_VERIFYPEER_OFF) -set(CTEST_DROP_METHOD "https") +set(CTEST_DROP_METHOD "http") set(CTEST_DROP_SITE "lcgapp-cdash-2.cern.ch") set(CTEST_DROP_LOCATION "/submit.php?project=LCGSoft") set(CTEST_DROP_SITE_CDASH TRUE) -- GitLab