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-ci.yml | |
| 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-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 78 |
1 files changed, 59 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9f94f0..c4667fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,6 +80,20 @@ CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" +.cuda10.2: &cuda + image: "kitware/cmake:ci-cuda10.2-x86_64-2020-06-11" + + variables: + GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" + CTEST_LABELS: "CUDA" + +.cuda10.2_nvidia: &cuda10_2_nvidia + extends: .cuda10.2 + + variables: + CMAKE_CONFIGURATION: cuda10.2_nvidia + CTEST_NO_WARNINGS_ALLOWED: 1 + .macos: &macos variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci ext/$CI_CONCURRENT_ID" @@ -169,6 +183,12 @@ - linux - linux-3.17 # Needed to be able to load Fedora's Qt libraries. +.linux_builder_tags_cuda: &linux_builder_tags_cuda + tags: + - cuda-rt + - docker + - linux + .macos_builder_tags: &macos_builder_tags tags: - cmake # Since this is a bare runner, pin to a project. @@ -383,6 +403,23 @@ interruptible: true +.cmake_test_unix_package: &cmake_test_unix_package + stage: test-ext + + script: + - *before_script_unix + # Make the CMake package available. + - mkdir -p build/install + - tar -C build/install --strip-components=1 -xzf build/cmake-*-Linux-x86_64.tar.gz + - .gitlab/ci/sccache.sh + # Allow the server to already be running. + - "sccache --start-server || :" + - sccache --show-stats + - "$LAUNCHER build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake" + - sccache --show-stats + + interruptible: true + .cmake_test_unix_external: &cmake_test_unix_external stage: test-ext @@ -439,6 +476,28 @@ build:centos6-release: - *linux_builder_tags rules: *manual_rules_settings +test:fedora31-makefiles: + <<: + - *fedora31_makefiles + - *cmake_test_unix_package + - *linux_builder_tags_qt + rules: *rules_settings + dependencies: + - build:centos6-release + needs: + - build:centos6-release + +test:cuda10.2-nvidia: + <<: + - *cuda10_2_nvidia + - *cmake_test_unix_package + - *linux_builder_tags_cuda + rules: *rules_settings + dependencies: + - build:centos6-release + needs: + - build:centos6-release + build:fedora31-ninja: <<: - *fedora31_ninja @@ -470,25 +529,6 @@ test:fedora31-ninja-multi: needs: - test:fedora31-ninja -build:fedora31-makefiles: - <<: - - *fedora31_makefiles - - *cmake_build_unix - - *cmake_build_artifacts - - *linux_builder_tags_qt - rules: *manual_rules_settings - -test:fedora31-makefiles: - <<: - - *fedora31_makefiles - - *cmake_test_unix - - *linux_builder_tags_qt - rules: *rules_settings - dependencies: - - build:fedora31-makefiles - needs: - - build:fedora31-makefiles - build:macos-ninja: <<: - *macos_ninja |