Use [email protected] and update Spack (#563)

* Radiuss Spack Configs and Uberenv were reverted to older version * Use [email protected] for local and shared tioga CI jobs * Point at RSC@main
LLNL · Jun 5, 2024 · 18afd78 · 18afd78
1 parent 335d080
commit 18afd78
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml
@@ -28,8 +28,8 @@ master:
     SPEC: " +tests %[email protected]"
   extends: .job_on_tioga
 
-rocmcc_5_7_1_hip:
+rocmcc_6_1_1_hip:
   variables:
     ON_TIOGA: "OFF"
-    SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %rocmcc@5.7.1 ^hip@5.7.1 ${PROJECT_TIOGA_DEPS}"
+    SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %rocmcc@6.1.1 ^hip@6.1.1 ${PROJECT_TIOGA_DEPS}"
   extends: .job_on_tioga
diff --git a/.uberenv_config.json b/.uberenv_config.json
@@ -4,7 +4,7 @@
     "package_source_dir" : "../..",
     "package_final_phase" : "initconfig",
     "spack_url": "https://github.com/spack/spack.git",
-    "spack_branch": "develop-2024-02-18",
+    "spack_branch": "develop-2024-05-26",
     "spack_activate" : {},
     "spack_configs_path": "scripts/radiuss-spack-configs",
     "spack_packages_path": "scripts/radiuss-spack-configs/packages",

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs