diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a785baa692b8bcc3b951e5aeb8fb5bfe05d8ceb9..642033997e2f865976e6e668cae4b04dc4a9a90a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ variables: BUILD_TYPE: Release BUILD_TESTS: "true" BUILD_CTEST: "true" + CTEST_INCLUDE_REGEX: "" # Regex is given via ctest -R [regex] CPU_TARGET: ivybridge # envinf1 has oldest cpu ARTIFACTS_PAGES_URL: https://$CI_PROJECT_ROOT_NAMESPACE.$CI_PAGES_DOMAIN/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts diff --git a/scripts/ci/extends/template-build-linux.yml b/scripts/ci/extends/template-build-linux.yml index af4dbed25c515ec0ae1520fb74f205d0a7bfa8f1..8ce8e851798ba70af971d1f67ccc15452459c312 100644 --- a/scripts/ci/extends/template-build-linux.yml +++ b/scripts/ci/extends/template-build-linux.yml @@ -45,9 +45,14 @@ xvfb_run_cmd="xvfb-run -a" fi + regex_argument="" + if [[ ! -z "$CTEST_INCLUDE_REGEX" ]]; then + regex_argument="-R ${CTEST_INCLUDE_REGEX}" + fi + # -M Continuous does not run any tests -> -M Experimental --group Continuous # --test-dir has to be provided despite using a preset - ${xvfb_run_cmd} ctest -M Experimental --group Continuous --test-dir ${build_dir_full} -T Test -T Submit --preset=${CMAKE_PRESET}${preset_postfix} --output-junit Tests/ctest.xml --stop-time `date -d "today + ${ctest_timeout} minutes" +'%H:%M:%S'` ${CTEST_ARGS} + ${xvfb_run_cmd} ctest -M Experimental ${regex_argument} --group Continuous --test-dir ${build_dir_full} -T Test -T Submit --preset=${CMAKE_PRESET}${preset_postfix} --output-junit Tests/ctest.xml --stop-time `date -d "today + ${ctest_timeout} minutes" +'%H:%M:%S'` ${CTEST_ARGS} fi else