From 2919d6e3833d885e3e9884daff8e1a45694cc760 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Mon, 22 Jan 2024 14:58:43 +0100
Subject: [PATCH] Change of strategies
---
.gitlab-ci.yml | 16 ++++++----------
repos.yaml | 4 ++--
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1aaee5c..a8f4b2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,13 +36,15 @@ variables:
APPTAINER_EXEC_OPTIONS: ${apptainer_options} --bind ${BUILDCACHE}:/buildcache:rw --writable-tmpfs
.setup_spack:
- cache:
- key: extra-repos-${environment}
- paths:
- - /stack/extra_repos
before_script:
- /opt/spack/bin/spack gpg trust $GPG_PRIVATE_KEY
+ - mkdir -p /stack/extra_repos
+ - cd /stack/extra_repos
+
+ - git clone https://gitlab.epfl.ch/SCITAS/software-stack/spack-repo-externals.git
+ - git clone https://gitlab.epfl.ch/SCITAS/software-stack/scitas-spack-packages.git
+
# ------------------------------------------------------------------------------
spack:setup:
stage: environment
@@ -55,12 +57,6 @@ spack:setup:
/opt/spack/bin/spack gpg publish -d /buildcache
fi
- - mkdir -p extra_repos
- - cd extra_repos
-
- - git clone https://gitlab.epfl.ch/SCITAS/software-stack/spack-repo-externals.git
- - git clone https://gitlab.epfl.ch/SCITAS/software-stack/scitas-spack-packages.git
-
spack:concretize:
stage: concretize
extends:
diff --git a/repos.yaml b/repos.yaml
index 0115ab6..0b4a932 100644
--- a/repos.yaml
+++ b/repos.yaml
@@ -1,3 +1,3 @@
repos:
- - extra_repos/spack-repo-externals
- - extra_repos/scitas-spack-packages
+ - /stack/extra_repos/spack-repo-externals
+ - /stack/extra_repos/scitas-spack-packages
--
GitLab