Merge pull request #116 from lanl/rberger/ci_new_deployment

Use new CI deployment

Author: Yurlungur

.gitlab-ci.yml

@@ -5,7 +5,8 @@ variables:
   PROJECT_NAME: spiner
   ENABLE_CDASH: true
   # use this variable if there is a xcap/deployment MR you want to use instead
-  # PROJECT_SPACK_ENV_VERSION: mr/62/2024-10-15
+  # PROJECT_SPACK_ENV_VERSION: "mr/62/2024-10-15"
+  PROJECT_SPACK_ENV_VERSION: "2025-01-18"
 
 include:
  - .gitlab/common.yml
@@ -36,7 +37,7 @@ include:
 
 prereq_offline_deps:
   stage: build_n_test
-  extends: [.ascgit_job]
+  extends: [.ascgit_job, .darwin_job]
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
     - if: $CI_PIPELINE_SOURCE == "schedule"
@@ -149,7 +150,7 @@ rzadams_craympich_rocm_mi300_cce:
 
 # collect job results from RZansel and submit them to CDash
 post_rzansel_results_to_cdash:
-  extends: [.post_results_to_cdash]
+  extends: [.post_results_to_cdash, .darwin_job]
   allow_failure: true
   rules:
     - if: $ENABLE_CDASH == "true" && $ENABLED_CLUSTERS =~ /rzansel/ && $GITLAB_USER_LOGIN =~ $RZANSEL_USERS && $CI_PIPELINE_SOURCE == "merge_request_event"
@@ -166,7 +167,7 @@ post_rzansel_results_to_cdash:
 
 # collect job results from RZvernal and submit them to CDash
 post_rzvernal_results_to_cdash:
-  extends: [.post_results_to_cdash]
+  extends: [.post_results_to_cdash, .darwin_job]
   allow_failure: true
   rules:
     - if: $ENABLE_CDASH == "true" && $ENABLED_CLUSTERS =~ /rzvernal/ && $GITLAB_USER_LOGIN =~ $RZVERNAL_USERS && $CI_PIPELINE_SOURCE == "merge_request_event"
@@ -182,7 +183,7 @@ post_rzvernal_results_to_cdash:
 
 # collect job results from RZadams and submit them to CDash
 post_rzadams_results_to_cdash:
-  extends: [.post_results_to_cdash]
+  extends: [.post_results_to_cdash, .darwin_job]
   allow_failure: true
   rules:
     - if: $ENABLE_CDASH == "true" && $ENABLED_CLUSTERS =~ /rzadams/ && $GITLAB_USER_LOGIN =~ $RZADAMS_USERS && $CI_PIPELINE_SOURCE == "merge_request_event"

.gitlab/build_and_test.cmake

@@ -4,7 +4,11 @@ set(CTEST_PROJECT_NAME "$ENV{PROJECT_NAME}")
 
 
 set(CTEST_SITE "$ENV{SYSTEM_NAME}")
-set(CTEST_BUILD_NAME "$ENV{SPACK_ENV_NAME}")
+if("$ENV{CI_PIPELINE_SOURCE}" STREQUAL "merge_request_event")
+  set(CTEST_BUILD_NAME "$ENV{SPACK_ENV_NAME}, source=$ENV{CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}, target=$ENV{CI_MERGE_REQUEST_TARGET_BRANCH_NAME}, MR=$ENV{CI_MERGE_REQUEST_IID}")
+else()
+  set(CTEST_BUILD_NAME "$ENV{SPACK_ENV_NAME}, Branch=$ENV{CI_COMMIT_REF_NAME}")
+endif()
 
 set(CTEST_SUBMIT_URL "$ENV{CDASH_SERVER_URL}/submit.php?project=${CTEST_PROJECT_NAME}")
 set(CTEST_CURL_OPTIONS CURLOPT_SSL_VERIFYPEER_OFF CURLOPT_SSL_VERIFYHOST_OFF)

.gitlab/common.yml

@@ -213,6 +213,7 @@ default:
   variables:
     GIT_SUBMODULE_STRATEGY: none
   script:
+    - module load cmake
     - cmake --version
     - ls *.tar.gz
     - export SOURCE_DIR=$PWD