From b56eb6da12481615cb6d1276d3f018f5410795cc Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Mon, 19 Feb 2024 15:24:23 +0100
Subject: [PATCH] Moving stack files in a subfolder
---
.gitlab-ci.yml | 9 +++++----
config.json => stacks/pinot-noir/config.json | 0
config.yaml => stacks/pinot-noir/config.yaml | 0
mirrors.yaml => stacks/pinot-noir/mirrors.yaml | 0
packages.yaml => stacks/pinot-noir/packages.yaml | 0
spack.yaml => stacks/pinot-noir/spack.yaml | 0
6 files changed, 5 insertions(+), 4 deletions(-)
rename config.json => stacks/pinot-noir/config.json (100%)
rename config.yaml => stacks/pinot-noir/config.yaml (100%)
rename mirrors.yaml => stacks/pinot-noir/mirrors.yaml (100%)
rename packages.yaml => stacks/pinot-noir/packages.yaml (100%)
rename spack.yaml => stacks/pinot-noir/spack.yaml (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d16d870..48f5ecf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,6 +27,7 @@ variables:
# slurm_options: ["-c 36"]
- environment: [jed]
slurm_options: ["-c 72 -p jed -q jed"]
+ stack: ["pinot-noir"]
# - environment: [izar]
# slurm_options: ['-c 40 --gres gpu:2']
# apptainer_options: ['-nv']
@@ -68,7 +69,7 @@ spack:install_compilers:
- .parallel_job
script:
- ci/install_compilers.sh
- - spack/bin/spack -e . config blame compilers
+ - spack/bin/spack -e stacks/${stack} config blame compilers
artifacts:
reports:
junit: spack-install.xml
@@ -82,8 +83,8 @@ spack:concretize:
- .spack_cache
- .parallel_job
script:
- - spack/bin/spack -e . config blame
- - spack/bin/spack -e . concretize
+ - spack/bin/spack -e stacks/${stack} config blame
+ - spack/bin/spack -e stacks/${stack} concretize
needs:
- job: spack:install_compilers
artifacts:
@@ -96,7 +97,7 @@ spack:install:
- .spack_cache
- .parallel_job
script:
- - spack/bin/spack -e . install
+ - spack/bin/spack -e stacks/${stack} install
--log-file spack-install.xml
--log-format junit
--only-concrete
diff --git a/config.json b/stacks/pinot-noir/config.json
similarity index 100%
rename from config.json
rename to stacks/pinot-noir/config.json
diff --git a/config.yaml b/stacks/pinot-noir/config.yaml
similarity index 100%
rename from config.yaml
rename to stacks/pinot-noir/config.yaml
diff --git a/mirrors.yaml b/stacks/pinot-noir/mirrors.yaml
similarity index 100%
rename from mirrors.yaml
rename to stacks/pinot-noir/mirrors.yaml
diff --git a/packages.yaml b/stacks/pinot-noir/packages.yaml
similarity index 100%
rename from packages.yaml
rename to stacks/pinot-noir/packages.yaml
diff --git a/spack.yaml b/stacks/pinot-noir/spack.yaml
similarity index 100%
rename from spack.yaml
rename to stacks/pinot-noir/spack.yaml
--
GitLab