diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43bd9e9c530f1fb3a1e370eca2d3cc00d6f2b340..6463b5b36178fbcbb1a6d57622dcaa987fc5c9be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -186,7 +186,7 @@ build-spack-env-on-runner: - spack repo add . - spack env create $SPACK_DEV_ENV spack.yaml - spack env activate $SPACK_DEV_ENV - - spack install --overwrite -y -j2 --fresh --test root + - spack install -y -j2 --fresh --test root after_script: - mkdir spack_logs - | @@ -261,7 +261,7 @@ sync-gitlab-spack-instance: # There is a known spack bug (https://github.com/spack/spack/issues/29447) in installing test dependencies for installation tests. The workaround suggested # in the issue is to NOT concretize separately, but simply remove the .lock file and let the enironment be concretized by the spack install command: - rm $SPACK_ROOT/var/spack/environments/$SPACK_NFS_ENV/spack.lock || echo "No spack.lock file" - - spack install --overwrite -y -j2 --fresh --test root + - spack install -y -j2 --fresh --test root - spack module tcl refresh -y - spack reindex - spack env loads -r