From 77bdcc949db26cbe7f0b68e67d1def596b426741 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 3 Mar 2022 11:58:13 -0500
Subject: gitlab-ci: run CUDA and HIP test jobs in any non-MR pipeline

Previously we only ran these in a scheduled nightly pipeline.
We should run them in pipelines on integration branches too,
particularly for the `release` branch.
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08fc107517..c127bb7f1e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -236,7 +236,7 @@ t:cuda9.2-nvidia:
         - .run_dependent
         - .needs_centos6_x86_64
     variables:
-        CMAKE_CI_JOB_NIGHTLY: "true"
+        CMAKE_CI_NO_MR: "true"
 
 t:cuda10.2-nvidia:
     extends:
@@ -255,7 +255,7 @@ t:cuda10.2-clang:
         - .run_dependent
         - .needs_centos6_x86_64
     variables:
-        CMAKE_CI_JOB_NIGHTLY: "true"
+        CMAKE_CI_NO_MR: "true"
 
 t:hip4.2-radeon:
     extends:
@@ -265,7 +265,7 @@ t:hip4.2-radeon:
         - .run_dependent
         - .needs_centos6_x86_64
     variables:
-        CMAKE_CI_JOB_NIGHTLY: "true"
+        CMAKE_CI_NO_MR: "true"
 
 b:fedora35-ninja:
     extends:
-- 
cgit v1.2.1


From 1f601753d75f2b3c5dedb5fdebc72354049e0d94 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 28 Feb 2022 17:55:11 -0500
Subject: gitlab-ci: add jobs testing cuda11.6 with nvcc and clang 13

---
 .gitlab-ci.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c127bb7f1e..efd15b3268 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -257,6 +257,25 @@ t:cuda10.2-clang:
     variables:
         CMAKE_CI_NO_MR: "true"
 
+t:cuda11.6-nvidia:
+    extends:
+        - .cuda11.6_nvidia
+        - .cmake_test_linux_release
+        - .linux_builder_tags_cuda
+        - .cmake_junit_artifacts
+        - .run_dependent
+        - .needs_centos6_x86_64
+
+t:cuda11.6-clang:
+    extends:
+        - .cuda11.6_clang
+        - .cmake_test_linux_release
+        - .linux_builder_tags_cuda
+        - .run_dependent
+        - .needs_centos6_x86_64
+    variables:
+        CMAKE_CI_NO_MR: "true"
+
 t:hip4.2-radeon:
     extends:
         - .hip4.2_radeon
-- 
cgit v1.2.1