diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-12 15:02:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-12 15:02:35 (GMT) |
| commit | 3145264449cdc35aef14ff97011a65a782080758 (patch) | |
| tree | 2bff95058c5e3678b171f2176641376c38bd4fee /.gitlab | |
| parent | 81ea5eb63753cbba8018d62fbb1d6218868ee8fa (diff) | |
| parent | 2e7cefec03e580ea09c5479247d8d1991618e5ab (diff) | |
| download | CMake-3145264449cdc35aef14ff97011a65a782080758.zip CMake-3145264449cdc35aef14ff97011a65a782080758.tar.gz CMake-3145264449cdc35aef14ff97011a65a782080758.tar.bz2 | |
Merge topic 'gitlab-ci-ext-test-sets' into release-3.18
2e7cefec03 gitlab-ci: add a cuda10.2 builder
1a2961b895 Tests: add CUDA labels to tests which are affected by CUDA
2caa7502d5 ci: support running just a set of tests with external builders
26b4cbcf93 gitlab-ci: move Makefiles Linux tests to use the package
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4877
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_cuda10.2_nvidia.cmake | 3 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora31_makefiles.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/ctest_test_external.cmake | 7 | ||||
| -rw-r--r-- | .gitlab/ci/docker/cuda10.2/Dockerfile | 5 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/cuda10.2/install_deps.sh | 13 |
5 files changed, 29 insertions, 1 deletions
diff --git a/.gitlab/ci/configure_cuda10.2_nvidia.cmake b/.gitlab/ci/configure_cuda10.2_nvidia.cmake new file mode 100644 index 0000000..519699b --- /dev/null +++ b/.gitlab/ci/configure_cuda10.2_nvidia.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_CUDA "NVIDIA" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora31_makefiles.cmake b/.gitlab/ci/configure_fedora31_makefiles.cmake index 74768b7..20863a2 100644 --- a/.gitlab/ci/configure_fedora31_makefiles.cmake +++ b/.gitlab/ci/configure_fedora31_makefiles.cmake @@ -1 +1 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/ctest_test_external.cmake b/.gitlab/ci/ctest_test_external.cmake index 1e61d52..d92b936 100644 --- a/.gitlab/ci/ctest_test_external.cmake +++ b/.gitlab/ci/ctest_test_external.cmake @@ -53,10 +53,17 @@ if ("$ENV{CTEST_NO_WARNINGS_ALLOWED}" AND num_warnings GREATER 0) "Found ${num_warnings} warnings (treating as fatal).") endif () +set(ctest_label_args) +if (NOT "$ENV{CTEST_LABELS}" STREQUAL "") + list(APPEND ctest_label_args + INCLUDE_LABEL "$ENV{CTEST_LABELS}") +endif () + include("${CMAKE_CURRENT_LIST_DIR}/ctest_exclusions.cmake") ctest_test( PARALLEL_LEVEL "${nproc}" RETURN_VALUE test_result + ${ctest_label_args} EXCLUDE "${test_exclusions}") ctest_submit(PARTS Test) diff --git a/.gitlab/ci/docker/cuda10.2/Dockerfile b/.gitlab/ci/docker/cuda10.2/Dockerfile new file mode 100644 index 0000000..e0ea0e7 --- /dev/null +++ b/.gitlab/ci/docker/cuda10.2/Dockerfile @@ -0,0 +1,5 @@ +FROM nvidia/cuda:10.2-devel-ubuntu18.04 +MAINTAINER Ben Boeckel <ben.boeckel@kitware.com> + +COPY install_deps.sh /root/install_deps.sh +RUN sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/cuda10.2/install_deps.sh b/.gitlab/ci/docker/cuda10.2/install_deps.sh new file mode 100755 index 0000000..0d57cd3 --- /dev/null +++ b/.gitlab/ci/docker/cuda10.2/install_deps.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +apt-get update + +# Install development tools. +apt-get install -y \ + g++ \ + curl \ + git + +apt-get clean |