Merge pull request #75 from lanl/rberger/ci_updates

CI Updates
lanl · Dec 19, 2024 · 01abcef · 01abcef
2 parents a255ed9 + a80fcac
commit 01abcef
Show file tree

Hide file tree

Showing 3 changed files with 6 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/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.14)
 # ----------------------------------------
 
 # define project and version
-set(PORTS_OF_CALL_VERSION 1.6.0)
+set(PORTS_OF_CALL_VERSION 1.7.0)
 project(ports-of-call VERSION ${PORTS_OF_CALL_VERSION})
 
 # CMAKE WARMUP

diff --git a/spack-repo/packages/ports-of-call/package.py b/spack-repo/packages/ports-of-call/package.py
@@ -16,6 +16,7 @@ class PortsOfCall(CMakePackage):
     maintainers = ["rbberger"]
 
     version("main", branch="main")
+    version("1.7.0", sha256="99045a7c4e3fbc73f01e930ce870cdc573a39910a28d85c54d65d2135f764bfc")
     version("1.6.0", sha256="290da149d4ad79c15787956559aeeefa0a06403be2f08cd324562ef013306797")
     version("1.5.2", sha256="73d16fe9236a9475010dbb01bf751c15bef01eb2e15bf92c8d9be2c0a606329f")
     version("1.5.1", sha256="b1f0232cd6d2aac65385d77cc061ec5035283ea50d0f167e7003eae034effb78")