Use GitLab container registry as a Spack build cache (#453)

* Apply changes for build cache + unify logs + explicit extra CI specs * Update RAJA to develop with build cache support --------- Co-authored-by: Rich Hornung <[email protected]>
LLNL · Sep 5, 2024 · 262dcbb · 262dcbb
1 parent 735a81f
commit 262dcbb
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 91 deletions.
diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml
@@ -71,3 +71,15 @@ variables:
   artifacts:
     reports:
       junit: junit.xml
+
+.reproducer_vars:
+  script:
+    - |
+      echo -e "
+      # Required variables \n
+      export MODULE_LIST=\"${MODULE_LIST}\" \n
+      export SPEC=\"${SPEC//\"/\\\"}\" \n
+      # Allow to set job script for debugging (only this differs from CI) \n
+      export DEBUG_MODE=true \n
+      # Using the CI build cache is optional and requires a token. Set it like so: \n
+      # export REGISTRY_TOKEN=\"<your token here>\" \n"
diff --git a/.gitlab/jobs/corona.yml b/.gitlab/jobs/corona.yml
@@ -9,9 +9,7 @@
 # Override reproducer section to define project specific variables.
 .corona_reproducer_vars:
   script:
-    - |
-      echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
-      echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
+    - !reference [.reproducer_vars, script]
 
 ########################
 # Overridden shared jobs

diff --git a/.gitlab/jobs/lassen.yml b/.gitlab/jobs/lassen.yml
@@ -9,9 +9,7 @@
 # Override reproducer section to define project specific variables.
 .lassen_reproducer_vars:
   script:
-    - |
-      echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
-      echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
+    - !reference [.reproducer_vars, script]
 
 ########################
 # Overridden shared jobs
@@ -44,14 +42,14 @@ gcc_8_3_1:
 gcc_8_3_1_cuda_11_5_0_ats_disabled:
   extends: .job_on_lassen
   variables:
-    SPEC: " ~shared +openmp +cuda %gcc@=8.3.1 cuda_arch=70 ^[email protected]+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
+    SPEC: " ~shared +openmp +cuda %gcc@=8.3.1 cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^blt@develop"
     MODULE_LIST: "cuda/11.5.0"
     LASSEN_JOB_ALLOC: "1 --atsdisable -W 30 -q pci"
 
 gcc_8_3_1_cuda_11_5_0_ats_disabled_mpi:
   extends: .job_on_lassen
   variables:
-    SPEC: " ~shared +openmp +cuda +mpi %gcc@=8.3.1 cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^spectrum-mpi ${PROJECT_LASSEN_DEPS}"
+    SPEC: " ~shared +openmp +cuda +mpi %gcc@=8.3.1 cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^spectrum-mpi ^blt@develop"
     MODULE_LIST: "cuda/11.5.0"
     LASSEN_JOB_ALLOC: "1 --atsdisable -W 30 -q pci"
 
@@ -61,7 +59,7 @@ gcc_8_3_1_cuda_11_5_0_ats_disabled_mpi:
 
 clang_13_0_1_libcpp:
   variables:
-    SPEC: " ~shared +openmp %clang@=13.0.1 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ${PROJECT_LASSEN_DEPS}"
+    SPEC: " ~shared +openmp %clang@=13.0.1 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^blt@develop"
   extends: .job_on_lassen
 
 #clang_14_0_5_asan:

diff --git a/.gitlab/jobs/poodle.yml b/.gitlab/jobs/poodle.yml
@@ -9,9 +9,7 @@
 # Override reproducer section to define projet specific variables.
 .poodle_reproducer_vars:
   script:
-    - |
-      echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
-      echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
+    - !reference [.reproducer_vars, script]
 
 ########################
 # Overridden shared jobs
@@ -50,6 +48,6 @@ intel_2022_1_0:
 
 intel_2022_1_0_mpi:
   variables:
-    SPEC: "~shared +openmp +mpi %intel@=2022.1.0 ^mvapich2 ${PROJECT_POODLE_DEPS}"
+    SPEC: "~shared +openmp +mpi %intel@=2022.1.0 ^mvapich2 ^blt@develop"
   allow_failure: true
   extends: .job_on_poodle
diff --git a/.gitlab/jobs/ruby.yml b/.gitlab/jobs/ruby.yml
@@ -9,9 +9,7 @@
 # Override reproducer section to define project specific variables.
 .ruby_reproducer_vars:
   script:
-    - |
-      echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
-      echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
+    - !reference [.reproducer_vars, script]
 
 #######################
 # Overridden shared jobs
@@ -51,5 +49,5 @@ intel_2022_1_0:
 
 intel_2022_1_0_mpi:
   variables:
-    SPEC: "~shared +openmp +mpi %intel@=2022.1.0 ^mvapich2 ${PROJECT_RUBY_DEPS}"
+    SPEC: "~shared +openmp +mpi %intel@=2022.1.0 ^mvapich2 ^blt@develop"
   extends: .job_on_ruby
diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml
@@ -9,9 +9,7 @@
 # Override reproducer section to define project specific variables.
 .tioga_reproducer_vars:
   script:
-    - |
-      echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
-      echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
+    - !reference [.reproducer_vars, script]
 
 ########################
 # Overridden shared jobs
@@ -31,11 +29,11 @@
 
 rocmcc_6_1_1_hip_openmp:
   variables:
-    SPEC: "~shared +rocm +openmp amdgpu_target=gfx90a %rocmcc@=6.1.1 ^[email protected] ${PROJECT_TIOGA_DEPS}"
+    SPEC: "~shared +rocm +openmp amdgpu_target=gfx90a %rocmcc@=6.1.1 ^[email protected] ^blt@develop"
   extends: .job_on_tioga
 
 rocmcc_6_1_1_hip_openmp_mpi:
   variables:
-    SPEC: "~shared +rocm +openmp +mpi amdgpu_target=gfx90a %rocmcc@=6.1.1 ^[email protected] ${PROJECT_TIOGA_DEPS}"
+    SPEC: "~shared +rocm +openmp +mpi amdgpu_target=gfx90a %rocmcc@=6.1.1 ^[email protected] ^blt@develop"
   extends: .job_on_tioga
   allow_failure: true