Merge pull request #108 from lanl/rberger/ci_updates

ci: update settings
lanl · Dec 19, 2024 · ac0669a · ac0669a
2 parents 7a74e54 + b5b4059
commit ac0669a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.gitlab/common.yml b/.gitlab/common.yml
@@ -76,7 +76,7 @@ default:
 .venado_job:
   variables:
     CLUSTER: venado
-    SCHEDULER_PARAMETERS: "-N 1 -A lanl_ai_g -p gpu --time=02:00:00"
+    SCHEDULER_PARAMETERS: "-N 1 -A asc-ci_g -p ci_g --qos ci_g --reservation ci_g --time=02:00:00"
   tags:
     - venado
     - batch
@@ -105,6 +105,7 @@ default:
   variables:
     CLUSTER: rzansel
     LLNL_LSF_SCHEDULER_PARAMETERS: "--nnodes=1"
+    CUSTOM_CI_BUILDS_DIR: "/usr/workspace/$$USER/xcap-gitlab-ci"
 
 .rzansel_regular_job:
   variables:
@@ -123,6 +124,7 @@ default:
   variables:
     CLUSTER: rzvernal
     LLNL_FLUX_SCHEDULER_PARAMETERS: "-N=1 --time-limit=2h"
+    CUSTOM_CI_BUILDS_DIR: "/usr/workspace/$$USER/xcap-gitlab-ci"
 
 .rzvernal_regular_job:
   variables:
@@ -141,6 +143,7 @@ default:
   variables:
     CLUSTER: rzadams
     LLNL_FLUX_SCHEDULER_PARAMETERS: "-N=1 --time-limit=2h"
+    CUSTOM_CI_BUILDS_DIR: "/usr/workspace/$$USER/xcap-gitlab-ci"
 
 .rzadams_regular_job:
   variables:

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -12,7 +12,7 @@
 
 spiner_content_declare(Catch2
   GIT_REPO       https://github.com/catchorg/Catch2.git
-  GIT_TAG        v3.0.1 # or any later release
+  GIT_TAG        v3.7.1 # or any later release
   EXPECTED_TARGETS Catch2::Catch2
   NAMESPACE spinerTest
 )