diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml | 14 | ||||
| -rwxr-xr-x | share/spack/spack-completion.bash | 17 |
3 files changed, 23 insertions, 11 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml index 579d7b56f3..0247803a30 100644 --- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml +++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml @@ -28,10 +28,11 @@ default: - cd share/spack/gitlab/cloud_pipelines/stacks/${SPACK_CI_STACK_NAME} - spack env activate --without-view . - spack ci generate --check-index-only + --artifacts-root "${CI_PROJECT_DIR}/jobs_scratch_dir" --output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/cloud-ci-pipeline.yml" artifacts: paths: - - "${CI_PROJECT_DIR}/jobs_scratch_dir/cloud-ci-pipeline.yml" + - "${CI_PROJECT_DIR}/jobs_scratch_dir" tags: ["spack", "public", "medium", "x86_64"] interruptible: true diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml index f187b2c6b3..96041479ec 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml @@ -43,16 +43,16 @@ spack: - argobots # - ascent # - axom - # - bolt + - bolt # - caliper # - darshan-runtime - darshan-util # - dyninst - # - faodel + - faodel # - flecsi+cinch # - flit # - gasnet - # - ginkgo + - ginkgo # - globalarrays # - gotcha # - hdf5 @@ -68,7 +68,7 @@ spack: # - mercury # - mfem # - mpifileutils@develop~xattr - # - ninja + - ninja # - omega-h # - openmpi # - openpmd-api @@ -115,14 +115,15 @@ spack: - - $e4s - - $arch - mirrors: { "mirror": "s3://spack-binaries-develop/e4s-new-cluster" } + mirrors: { "mirror": "s3://spack-binaries-develop/e4s" } gitlab-ci: script: - . "./share/spack/setup-env.sh" - spack --version - - cd share/spack/gitlab/cloud_pipelines/stacks/e4s + - cd ${SPACK_CONCRETE_ENV_DIR} - spack env activate --without-view . + - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'" - spack -d ci rebuild mappings: - match: [cuda, dyninst, hpx, precice, strumpack, sundials, trilinos, vtk-h, vtk-m] @@ -134,6 +135,7 @@ spack: image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2020-09-01", "entrypoint": [""] } tags: ["spack", "public", "large", "x86_64"] temporary-storage-url-prefix: "s3://spack-binaries-prs/pipeline-storage" + broken-specs-url: "s3://spack-binaries-develop/broken-specs" service-job-attributes: before_script: - . "./share/spack/setup-env.sh" diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash index 7335faaa28..bc0f57b18c 100755 --- a/share/spack/spack-completion.bash +++ b/share/spack/spack-completion.bash @@ -495,22 +495,31 @@ _spack_ci() { then SPACK_COMPREPLY="-h --help" else - SPACK_COMPREPLY="generate rebuild rebuild-index" + SPACK_COMPREPLY="generate rebuild-index rebuild reproduce-build" fi } _spack_ci_generate() { - SPACK_COMPREPLY="-h --help --output-file --copy-to --optimize --dependencies --prune-dag --no-prune-dag --check-index-only" + SPACK_COMPREPLY="-h --help --output-file --copy-to --optimize --dependencies --prune-dag --no-prune-dag --check-index-only --artifacts-root" } -_spack_ci_rebuild() { +_spack_ci_rebuild_index() { SPACK_COMPREPLY="-h --help" } -_spack_ci_rebuild_index() { +_spack_ci_rebuild() { SPACK_COMPREPLY="-h --help" } +_spack_ci_reproduce_build() { + if $list_options + then + SPACK_COMPREPLY="-h --help --working-dir" + else + SPACK_COMPREPLY="" + fi +} + _spack_clean() { if $list_options then |