diff --git a/FairMQTest.cmake b/FairMQTest.cmake index 4f9532c5..602b820a 100644 --- a/FairMQTest.cmake +++ b/FairMQTest.cmake @@ -44,8 +44,10 @@ list(APPEND options "-DDISABLE_COLOR=ON" "-DBUILD_SDK_COMMANDS=ON" "-DBUILD_SDK=ON" - "-DBUILD_DDS_PLUGIN=ON" - ) + "-DBUILD_DDS_PLUGIN=ON") +if(RUN_STATIC_ANALYSIS) + list(APPEND options "-DRUN_STATIC_ANALYSIS=ON") +endif() list(JOIN options ";" optionsstr) ctest_configure(OPTIONS "${optionsstr}") diff --git a/Jenkinsfile b/Jenkinsfile index f77bc591..0c27b979 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ def jobMatrix(String prefix, String type, List specs) { sh "cat ${jobscript}" sh "bash ${jobscript}" } else { - def containercmd = "singularity exec -B/shared ${env.SINGULARITY_CONTAINER_ROOT}/fairmq/${os}.${ver}.sif bash -l -c \\\"${ctestcmd}\\\"" + def containercmd = "singularity exec -B/shared ${env.SINGULARITY_CONTAINER_ROOT}/fairmq/${os}.${ver}.sif bash -l -c \\\"${ctestcmd} -DRUN_STATIC_ANALYSIS=ON\\\"" sh """\ echo \"echo \\\"*** Job started at .......: \\\$(date -R)\\\"\" >> ${jobscript} echo \"echo \\\"*** Job ID ...............: \\\${SLURM_JOB_ID}\\\"\" >> ${jobscript} @@ -58,7 +58,7 @@ def jobMatrix(String prefix, String type, List specs) { pipeline{ agent none stages { - stage("Run CI Matrix") { + stage("CI") { steps{ script { def builds = jobMatrix('alfa-ci', 'build', [