diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3641788a42ef129646ef0273d12234b2eacf7f11..72d401e2b1a079b494c25629cd280685614610b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,11 +16,11 @@ workflow: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH variables: - BUILDCACHE: "/scratch/richart/buildcache" - SPACK_PATH: "/work/scitas-ge/richart/ci_cache/spack" - STACK_PATH: "/work/scitas-ge/richart/ci_cache/stack" + BUILDCACHE: "/work/scitas-ge/richart/buildcache" + SPACK_PATH: "/work/scitas-ge/richart/ci_cache/spack/${CI_JOB_ID}" + STACK_PATH: "/work/scitas-ge/richart/ci_cache/stack/${CI_JOB_ID}" SPACK_DISABLE_LOCAL_CONFIG: "true" - SPACK_USER_CACHE_PATH: "/tmp/spack_cache" + SPACK_USER_CACHE_PATH: "/tmp/spack_cache_${CI_JOB_ID}" SPACK_SITE_CONFIG_PATH: "/stack/spack/etc" # ------------------------------------------------------------------------------ .parallel_job: @@ -29,7 +29,8 @@ variables: matrix: - environment: [helvetios] slurm_options: ["-c 36"] - # - environment: [jed] + - environment: [jed] + slurm_options: ["-c 72 -p jed -q jed"] # - environment: [izar] # slurm_options: ['-c 40 --gres gpu:2'] # apptainer_options: ['-nv']