From 685491f28b77da32bd53cf6ec2380b2c4a42265d Mon Sep 17 00:00:00 2001
From: Nicolas Richart <networms@gmail.ch>
Date: Mon, 19 Feb 2024 23:31:07 +0100
Subject: [PATCH] Not sur files are where there should be
---
.gitlab-ci.yml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48f5ecf..f1de336 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,8 +23,8 @@ variables:
image: registry.c4science.ch/scitas-stack/rhel:9.3
parallel:
matrix:
-# - environment: [helvetios]
-# slurm_options: ["-c 36"]
+ # - environment: [helvetios]
+ # slurm_options: ["-c 36"]
- environment: [jed]
slurm_options: ["-c 72 -p jed -q jed"]
stack: ["pinot-noir"]
@@ -39,7 +39,7 @@ variables:
APPTAINER_EXEC_OPTIONS: ${apptainer_options} --bind ${BUILDCACHE}:/buildcache:rw
SPACK_USER_CACHE_PATH: "/tmp/spack_cache_${CI_JOB_ID}"
SPACK_USER_CONFIG_PATH: "/tmp/spack_user_${CI_JOB_ID}"
- SPACK_SYSTEM_CONFIG_PATH: "/stack/spack/etc"
+ SPACK_SYSTEM_CONFIG_PATH: "${CI_PROJECT_DIR}/stack/spack/etc"
BUILDCACHE: "/work/scitas-ge/richart/ci/buildcache"
.spack_cache:
@@ -49,7 +49,7 @@ variables:
paths:
- spack/
- stack/
- - compiler_definitions.yaml
+ - stacks/${stack}/compiler_definitions.yaml
# ------------------------------------------------------------------------------
spack:setup:
@@ -98,11 +98,11 @@ spack:install:
- .parallel_job
script:
- spack/bin/spack -e stacks/${stack} install
- --log-file spack-install.xml
- --log-format junit
- --only-concrete
- --fail-fast
- --show-log-on-error
+ --log-file spack-install.xml
+ --log-format junit
+ --only-concrete
+ --fail-fast
+ --show-log-on-error
needs:
- job: spack:concretize
artifacts:
--
GitLab