Merge 912a063 into 68a6144

pika-org · Jun 6, 2024 · bbb28a8 · bbb28a8
2 parents 68a6144 + 912a063
commit bbb28a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/.gitlab/includes/common_spack_pipeline.yml b/.gitlab/includes/common_spack_pipeline.yml
@@ -130,6 +130,8 @@ make_multiarch_image:
   extends:
     - .cmake_variables_common
   script:
+    - env
+    - echo $CLUSTER_NAME
     - spack arch
     - export CTEST_XML=$PWD/ctest.xml
     - trap "${SOURCE_DIR}/.gitlab/scripts/collect_ctest_metrics.sh ${CTEST_XML}" EXIT

diff --git a/.gitlab/pipelines_on_push.yml b/.gitlab/pipelines_on_push.yml
@@ -10,3 +10,5 @@ include:
   - local: '.gitlab/includes/performance_gcc13_pipeline.yml'
   - local: '.gitlab/includes/gcc12_hip5_pipeline.yml'
   - local: '.gitlab/includes/sloc.yml'
+  # TODO: Temporary
+  - local: '.gitlab/includes/clang18_pipeline.yml'
diff --git a/.gitlab/scripts/utilities.sh b/.gitlab/scripts/utilities.sh
@@ -94,6 +94,7 @@ function create_metadata_file {
 
     # System section
     json_add_from_command "${metadata_file}" "system" "hostname"
+    json_add_from_env "${metadata_file}" "system" CLUSTER_NAME
 
     # Slurm section
     json_add_from_env \