diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d97b0df0c0dc9a74fc6295aa270607a0070b6203..aeb2dfbd2c6b5608c9375d71449948d89076e6b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,33 +90,17 @@ spack:setup: - ci/setup_spack.sh needs: - job: spack:checkout - after_script: - - tar czf artifacts_${stack}_${environment}.tgz $stack/environment - artifacts: - paths: - - artifacts_${stack}_${environment}.tgz spack:install_compilers: stage: compilers extends: - .parallel_job - .spack_cache - before_script: - - if [ -e artifacts_${stack}_${environment}.tgz ]; - then - tar xzf artifacts_${stack}_${environment}.tgz; - fi script: - ci/install_compilers.sh - source ci/stack_env.sh - ${STACK_LOCATION}/spack/bin/spack -e ${environment} config blame compilers - after_script: - - tar czf - artifacts_${stack}_${environment}.tgz - $stack/spack/var/spack/environments artifacts: - paths: - - artifacts_${stack}_${environment}.tgz reports: junit: spack-install-*.xml needs: @@ -128,22 +112,14 @@ spack:concretize: extends: - .parallel_job - .spack_cache - before_script: - - if [ -e artifacts_${stack}_${environment}.tgz ]; - then - tar xzf artifacts_${stack}_${environment}.tgz; - fi script: - source ci/stack_env.sh - - ${STACK_LOCATION}/spack/bin/spack -e ${environment} config blame - - ${STACK_LOCATION}/spack/bin/spack -e ${environment} concretize --force - after_script: - - tar czf - artifacts_${stack}_${environment}.tgz - $stack/spack/var/spack/environments + - ${STACK_LOCATION}/spack/bin/spack -e ${environment} config blame | tess config.log + - ${STACK_LOCATION}/spack/bin/spack -e ${environment} concretize --force | tee concretize.log artifacts: paths: - - artifacts_${stack}_${environment}.tgz + - config.log + - concretize.log needs: - job: spack:install_compilers timeout: 5h @@ -153,11 +129,6 @@ spack:install: extends: - .parallel_job - .spack_cache - before_script: - - if [ -e artifacts_${stack}_${environment}.tgz ]; - then - tar xzf artifacts_${stack}_${environment}.tgz; - fi script: - source ci/stack_env.sh - echo "{}" > spack-install-${environment}.xml @@ -174,15 +145,9 @@ spack:install: --update-index --key EDC904DCE3D2E84E /buildcache - after_script: - - tar czf - artifacts_${stack}_${environment}.tgz - $stack/spack/var/spack/environments needs: - job: spack:concretize artifacts: - paths: - - artifacts_${stack}_${environment}.tgz reports: junit: spack-install-*.xml timeout: 10h