diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0ed7bf97161215e0e8235a0dc2a99e148a3c5c6..4db1c7b32f20483ee672434162fd7e14c5303d7b 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 9aae4405a2c8abc3cf760330bb6e48edd09232dd..97a1515cc26b8dfb011a1060e8fbf1926b6cd115 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