From 0556bd2f8a0cb4df6b2aaf157dc598358eef4c83 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 7 Oct 2020 06:11:00 -0400
Subject: gitlab-ci: use ctest_start GROUP option instead of deprecated TRACK

---
 .gitlab/ci/ctest_configure.cmake     |  2 +-
 .gitlab/ci/ctest_test_external.cmake |  2 +-
 .gitlab/ci/gitlab_ci.cmake           | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab/ci/ctest_configure.cmake b/.gitlab/ci/ctest_configure.cmake
index 55cad13..1c9d040 100644
--- a/.gitlab/ci/ctest_configure.cmake
+++ b/.gitlab/ci/ctest_configure.cmake
@@ -6,7 +6,7 @@ set(cmake_args
   -C "${CMAKE_CURRENT_LIST_DIR}/configure_$ENV{CMAKE_CONFIGURATION}.cmake")
 
 # Create an entry in CDash.
-ctest_start(Experimental TRACK "${ctest_track}")
+ctest_start(Experimental GROUP "${ctest_group}")
 
 # Gather update information.
 find_package(Git)
diff --git a/.gitlab/ci/ctest_test_external.cmake b/.gitlab/ci/ctest_test_external.cmake
index b31caa4..1b81da3 100644
--- a/.gitlab/ci/ctest_test_external.cmake
+++ b/.gitlab/ci/ctest_test_external.cmake
@@ -7,7 +7,7 @@ set(cmake_args
   -C "${CMAKE_CURRENT_LIST_DIR}/configure_$ENV{CMAKE_CONFIGURATION}.cmake")
 
 # Create an entry in CDash.
-ctest_start(Experimental TRACK "${ctest_track}")
+ctest_start(Experimental GROUP "${ctest_group}")
 
 # Gather update information.
 find_package(Git)
diff --git a/.gitlab/ci/gitlab_ci.cmake b/.gitlab/ci/gitlab_ci.cmake
index 7e5a7ab..8297514 100644
--- a/.gitlab/ci/gitlab_ci.cmake
+++ b/.gitlab/ci/gitlab_ci.cmake
@@ -45,20 +45,20 @@ if (NOT "$ENV{CMAKE_GENERATOR_TOOLSET}" STREQUAL "")
   set(CTEST_CMAKE_GENERATOR_TOOLSET "$ENV{CMAKE_GENERATOR_TOOLSET}")
 endif ()
 
-# Determine the track to submit to.
-set(ctest_track "Experimental")
+# Determine the group to submit to.
+set(ctest_group "Experimental")
 if (NOT "$ENV{CI_MERGE_REQUEST_ID}" STREQUAL "")
-  set(ctest_track "merge-requests")
+  set(ctest_group "merge-requests")
 elseif (NOT "$ENV{CMAKE_CI_PROJECT_CONTINUOUS_BRANCH}" STREQUAL "" AND "$ENV{CMAKE_CI_PROJECT_CONTINUOUS_BRANCH}" STREQUAL "$ENV{CI_COMMIT_BRANCH}" AND NOT "$ENV{CMAKE_CI_JOB_CONTINUOUS}" STREQUAL "")
   if (NOT "$ENV{CMAKE_CI_JOB_HELP}" STREQUAL "")
-    set(ctest_track "Continuous Help")
+    set(ctest_group "Continuous Help")
   else()
-    set(ctest_track "Continuous")
+    set(ctest_group "Continuous")
   endif()
 elseif ("$ENV{CI_PROJECT_PATH}" STREQUAL "cmake/cmake")
   if ("$ENV{CI_COMMIT_REF_NAME}" STREQUAL "master")
-    set(ctest_track "master")
+    set(ctest_group "master")
   elseif ("$ENV{CI_COMMIT_REF_NAME}" STREQUAL "release")
-    set(ctest_track "release")
+    set(ctest_group "release")
   endif ()
 endif ()
-- 
cgit v0.12


From 63c7e7ca04a9435edf662061bafc8fb3a349aece Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 7 Oct 2020 06:05:57 -0400
Subject: gitlab-ci: factor out ctest_start() model into a variable

---
 .gitlab/ci/ctest_configure.cmake     | 2 +-
 .gitlab/ci/ctest_test_external.cmake | 2 +-
 .gitlab/ci/gitlab_ci.cmake           | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab/ci/ctest_configure.cmake b/.gitlab/ci/ctest_configure.cmake
index 1c9d040..2682055 100644
--- a/.gitlab/ci/ctest_configure.cmake
+++ b/.gitlab/ci/ctest_configure.cmake
@@ -6,7 +6,7 @@ set(cmake_args
   -C "${CMAKE_CURRENT_LIST_DIR}/configure_$ENV{CMAKE_CONFIGURATION}.cmake")
 
 # Create an entry in CDash.
-ctest_start(Experimental GROUP "${ctest_group}")
+ctest_start("${ctest_model}" GROUP "${ctest_group}")
 
 # Gather update information.
 find_package(Git)
diff --git a/.gitlab/ci/ctest_test_external.cmake b/.gitlab/ci/ctest_test_external.cmake
index 1b81da3..9e2d421 100644
--- a/.gitlab/ci/ctest_test_external.cmake
+++ b/.gitlab/ci/ctest_test_external.cmake
@@ -7,7 +7,7 @@ set(cmake_args
   -C "${CMAKE_CURRENT_LIST_DIR}/configure_$ENV{CMAKE_CONFIGURATION}.cmake")
 
 # Create an entry in CDash.
-ctest_start(Experimental GROUP "${ctest_group}")
+ctest_start("${ctest_model}" GROUP "${ctest_group}")
 
 # Gather update information.
 find_package(Git)
diff --git a/.gitlab/ci/gitlab_ci.cmake b/.gitlab/ci/gitlab_ci.cmake
index 8297514..44ecf5f 100644
--- a/.gitlab/ci/gitlab_ci.cmake
+++ b/.gitlab/ci/gitlab_ci.cmake
@@ -19,6 +19,7 @@ endif ()
 # Set the build metadata.
 set(CTEST_BUILD_NAME "$ENV{CI_PROJECT_NAME}-$ENV{CMAKE_CONFIGURATION}")
 set(CTEST_SITE "gitlab-ci")
+set(ctest_model "Experimental")
 
 # Default to Release builds.
 if (NOT "$ENV{CMAKE_BUILD_TYPE}" STREQUAL "")
-- 
cgit v0.12


From 3f494b12ea91a807086eea87587184a1e266efe6 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 7 Oct 2020 06:01:57 -0400
Subject: gitlab-ci: configure continuous job ctest build name and model
 accordingly

---
 .gitlab/ci/gitlab_ci.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab/ci/gitlab_ci.cmake b/.gitlab/ci/gitlab_ci.cmake
index 44ecf5f..468619d 100644
--- a/.gitlab/ci/gitlab_ci.cmake
+++ b/.gitlab/ci/gitlab_ci.cmake
@@ -51,11 +51,13 @@ set(ctest_group "Experimental")
 if (NOT "$ENV{CI_MERGE_REQUEST_ID}" STREQUAL "")
   set(ctest_group "merge-requests")
 elseif (NOT "$ENV{CMAKE_CI_PROJECT_CONTINUOUS_BRANCH}" STREQUAL "" AND "$ENV{CMAKE_CI_PROJECT_CONTINUOUS_BRANCH}" STREQUAL "$ENV{CI_COMMIT_BRANCH}" AND NOT "$ENV{CMAKE_CI_JOB_CONTINUOUS}" STREQUAL "")
+  set(ctest_model "Continuous")
   if (NOT "$ENV{CMAKE_CI_JOB_HELP}" STREQUAL "")
     set(ctest_group "Continuous Help")
   else()
     set(ctest_group "Continuous")
   endif()
+  string(PREPEND CTEST_BUILD_NAME "continuous-")
 elseif ("$ENV{CI_PROJECT_PATH}" STREQUAL "cmake/cmake")
   if ("$ENV{CI_COMMIT_REF_NAME}" STREQUAL "master")
     set(ctest_group "master")
-- 
cgit v0.12


From dd47d0d7f49c85d8a3c5b644876aafc3c4ffc811 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 6 Oct 2020 07:20:07 -0400
Subject: gitlab-ci: add rules to enable jobs in a nightly pipeline schedule

---
 .gitlab/ci/gitlab_ci.cmake | 4 ++++
 .gitlab/rules.yml          | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/.gitlab/ci/gitlab_ci.cmake b/.gitlab/ci/gitlab_ci.cmake
index 468619d..f863a27 100644
--- a/.gitlab/ci/gitlab_ci.cmake
+++ b/.gitlab/ci/gitlab_ci.cmake
@@ -58,6 +58,10 @@ elseif (NOT "$ENV{CMAKE_CI_PROJECT_CONTINUOUS_BRANCH}" STREQUAL "" AND "$ENV{CMA
     set(ctest_group "Continuous")
   endif()
   string(PREPEND CTEST_BUILD_NAME "continuous-")
+elseif (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "")
+  set(ctest_model "Nightly")
+  set(ctest_group "Nightly Expected")
+  string(PREPEND CTEST_BUILD_NAME "nightly-")
 elseif ("$ENV{CI_PROJECT_PATH}" STREQUAL "cmake/cmake")
   if ("$ENV{CI_COMMIT_REF_NAME}" STREQUAL "master")
     set(ctest_group "master")
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index 1edfd97..5ee8333 100644
--- a/.gitlab/rules.yml
+++ b/.gitlab/rules.yml
@@ -4,6 +4,8 @@
     rules:
         - if: '$CMAKE_CI_PACKAGE == "true"'
           when: never
+        - if: '$CMAKE_CI_NIGHTLY == "true"'
+          when: on_success
         - if: '($CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != "" && $CI_COMMIT_BRANCH == $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH && $CMAKE_CI_JOB_CONTINUOUS == "true")'
           when: delayed
           start_in: 5 minutes
@@ -18,6 +20,8 @@
     rules:
         - if: '$CMAKE_CI_PACKAGE == "true"'
           when: never
+        - if: '$CMAKE_CI_NIGHTLY == "true"'
+          when: on_success
         - if: '($CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != "" && $CI_COMMIT_BRANCH == $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH && $CMAKE_CI_JOB_CONTINUOUS == "true")'
           when: on_success
         - if: '$CI_MERGE_REQUEST_ID'
@@ -30,6 +34,8 @@
     rules:
         - if: '$CMAKE_CI_PACKAGE == "true"'
           when: never
+        - if: '$CMAKE_CI_NIGHTLY == "true"'
+          when: on_success
         - if: '$CI_MERGE_REQUEST_ID'
           when: on_success
         - if: '$CI_PROJECT_PATH == "cmake/cmake"'
-- 
cgit v0.12