Merge branch 'cdash-upload' into 'master'

Fix CDash uploads

See merge request ogs/ogs!4669

CTestConfig.cmake

@@ -3,6 +3,7 @@ set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
 set(CTEST_SUBMIT_URL
  "https://cdash.opengeosys.org/submit.php?project=${CTEST_PROJECT_NAME}"
 )
+set(CTEST_SUBMIT_INACTIVITY_TIMEOUT 30)
 if(DEFINED ENV{CI_JOB_NAME})
  # Bug in CDash: Remove ":", see
  # https://github.com/Kitware/CDash/issues/1292

scripts/ci/extends/template-build-linux.yml

@@ -91,11 +91,12 @@
  echo "ctest arguments: ${ctest_arguments}"
  maybe_run_with_xvfb ctest \
  -M Experimental --group "${ctest_group}" "${regex_argument}" \
- --test-dir "${build_dir_full}" -T Start -T Test -T Submit \
+ --test-dir "${build_dir_full}" -T Start -T Test \
  ${ctest_arguments} \
  --output-junit Tests/ctest.xml \
  --stop-time "`date -d "today + ${ctest_timeout} minutes" +'%H:%M:%S'`" \
  --no-tests=error
+ ctest --test-dir "${build_dir_full}" -T Submit || true
  fi
  fi
 

scripts/ci/pipelines/linux.yml

@@ -1,5 +1,6 @@
 include:
  - local: "/scripts/ci/extends/*.yml"
+ - local: "/scripts/ci/jobs/pre-commit.yml"
  - local: "/scripts/ci/jobs/meta.yml"
  - local: "/scripts/ci/jobs/ci_images.yml"
  - local: "/scripts/ci/jobs/build-linux.yml"

scripts/ci/pipelines/mac.yml

@@ -1,5 +1,6 @@
 include:
  - local: "/scripts/ci/extends/*.yml"
+ - local: "/scripts/ci/jobs/pre-commit.yml"
  - local: "/scripts/ci/jobs/meta.yml"
  - local: "/scripts/ci/jobs/build-mac.yml"
  - local: "/scripts/ci/jobs/build-gui-mac.yml"

scripts/ci/pipelines/win.yml

@@ -1,5 +1,6 @@
 include:
  - local: "/scripts/ci/extends/*.yml"
+ - local: "/scripts/ci/jobs/pre-commit.yml"
  - local: "/scripts/ci/jobs/meta.yml"
  - local: "/scripts/ci/jobs/build-win.yml"
  - local: "/scripts/ci/jobs/build-gui-win.yml"