diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab index 2732fa93e6207cbc96bed7043e5d85000611763b..d3e55c965594dd98d0eb4a358c4dbf8ce15c67b7 100644 --- a/ci-scripts/Jenkinsfile-gitlab +++ b/ci-scripts/Jenkinsfile-gitlab @@ -47,8 +47,10 @@ pipeline { } post { failure { - def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Merge Conflicts -- Cannot perform CI" - addGitLabMRComment comment: message + script { + def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Merge Conflicts -- Cannot perform CI" + addGitLabMRComment comment: message + } } } } diff --git a/cmake_targets/autotests/run_exec_autotests.bash b/cmake_targets/autotests/run_exec_autotests.bash index 0947cdab3ec44318875f27f82c85d02fcd2a0cda..9a1a5cad023973a300da152423245a2fa1bdacbc 100755 --- a/cmake_targets/autotests/run_exec_autotests.bash +++ b/cmake_targets/autotests/run_exec_autotests.bash @@ -245,7 +245,7 @@ function test_compile_and_run() { #echo "pre_exec_file = $pre_exec_file" #echo "nruns = $nruns" echo "class = $class" - echo "desc = $desc" + #echo "desc = $desc" #compile_prog_array=() #read -a compile_prog_array <<<"$compile_prog"