From e66ae0669b57f2ea489a1e28ba278e2b6fb35e12 Mon Sep 17 00:00:00 2001 From: Nicolas Richart <nicolas.richart@epfl.ch> Date: Mon, 6 May 2024 23:39:49 +0200 Subject: [PATCH] more debug of path --- .gitlab-ci.yml | 2 ++ ci/stack_env.sh | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0ed7bf..4db1c7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,6 +36,8 @@ variables: - stack variables: COMMAND_OPTIONS_SBATCH: ${slurm_options} + STACK_CONFIG=${CI_PROJECT_DIR}/stacks/${stack}/config.json + STACK_LOCATION=$(jq -r .stack.mount_point ${STACK_CONFIG}) APPTAINER_EXEC_OPTIONS: ${apptainer_options} --bind ${BUILDCACHE}:/buildcache:rw --bind ${CI_PROJECT_DIR}:${STACK_LOCATION} SPACK_USER_CACHE_PATH: "/tmp/spack_cache_${CI_JOB_ID}" SPACK_USER_CONFIG_PATH: "/tmp/spack_user_${CI_JOB_ID}" diff --git a/ci/stack_env.sh b/ci/stack_env.sh index 9aae440..97a1515 100644 --- a/ci/stack_env.sh +++ b/ci/stack_env.sh @@ -1,8 +1,5 @@ #!/usr/bin/env sh -STACK_CONFIG_PATH=${PWD}/stacks/${stack} -STACK_CONFIG=${STACK_CONFIG_PATH}/config.json SPACK_VERSION=$(jq -r .spack.version ${STACK_CONFIG}) - STACK_LOCATION=$(jq -r .stack.mount_point ${STACK_CONFIG}) SPACK_SYSTEM_CONFIG_PATH=${STACK_LOCATION}/stack/${stack}/environment -- GitLab