From 3f7b44ba2fa73167d44a7579e274ac7f033a721f Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 24 Nov 2022 21:44:39 +0000
Subject: [PATCH] fix: debug loading env; remove variables in spack.yaml
---
.gitlab-ci.yml | 2 +-
spack.yaml | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd72810d1..f4958fd63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -236,7 +236,7 @@ generate-pipeline:
- git clone https://github.com/${EICSPACK_ORGREPO}.git ${SPACK_ROOT}/var/spack/repos/eic-spack
- git -C ${SPACK_ROOT}/var/spack/repos/eic-spack checkout ${EICSPACK_VERSION}
script:
- - spack env activate --without-view .
+ - spack -d env activate --without-view .
- spack -d ci generate
--artifacts-root "${CI_PROJECT_DIR}/jobs_scratch_dir"
--output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/pipeline.yml"
diff --git a/spack.yaml b/spack.yaml
index 0827b1f78..3eece3b10 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -68,22 +68,24 @@ spack:
gitlab-ci:
before_script:
- - git clone ${SPACK_REPO} spack
+ - git clone https://github.com/${SPACK_ORGREPO}.git spack
- git -C spack checkout ${SPACK_VERSION}
- . "./spack/share/spack/setup-env.sh"
- - git clone ${EICSPACK_REPO} ${SPACK_ROOT}/var/spack/repos/eic-spack
- - git -C ${SPACK_ROOT}/var/spack/repos/eic-spack checkout ${EICSPACK_VERSION}
+ - git clone https://github.com/${EICSPACK_ORGREPO}.git spack/var/spack/repos/eic-spack
+ - git -C spack/var/spack/repos/eic-spack checkout ${EICSPACK_VERSION}
script:
- pushd ${SPACK_CONCRETE_ENV_DIR} && spack env activate --without-view . && popd
- spack -d ci rebuild
mappings:
- - match:
- - os=ubuntu20.04
+ - match: ["os=ubuntu20.04"]
runner-attributes:
image: spack/ubuntu-focal
- - match:
- - os=ubuntu22.04
+ tags:
+ - docker-new
+ - match: ["os=ubuntu22.04"]
runner-attributes:
image: spack/ubuntu-jammy
+ tags:
+ - docker-new
enable-artifacts-buildcache: False
rebuild-index: True
--
GitLab