Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .ci/gitlab/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ variables:
# SPACK_CI_ENABLE_STACKS:
# value: /^.*(cray).*$/
# expand: false
SPACK_CI_ENABLE_STACKS:
value: /^.*(tutorial|build_systems).*$/
expand: false

default:
image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] }
Expand Down Expand Up @@ -59,6 +62,7 @@ default:
########################################
.base-job:
variables:
SPACK_CI_BUILDCACHE_VIEW: "append"
PIPELINE_MIRROR_TEMPLATE: "single-src-protected-mirrors.yaml.in"
SPACK_CI_CONFIG_ROOT: "${SPACK_CI_PACKAGES_ROOT}/.ci/gitlab/configs"
SPACK_CI_SCRIPTS_ROOT: "${SPACK_CI_PACKAGES_ROOT}/.ci/gitlab/scripts"
Expand Down
11 changes: 0 additions & 11 deletions .ci/gitlab/configs/copy-only-protected-mirrors.yaml.in

This file was deleted.

14 changes: 11 additions & 3 deletions .ci/gitlab/configs/multi-src-mirrors.yaml.in
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
mirrors:
buildcache-source:
# TODO: Remove the legacy upstream source mirror once views have populated sufficiently
buildcache-source-legacy:
fetch: ${PROTECTED_MIRROR_FETCH_DOMAIN}/${PR_TARGET_REF_NAME}/${SPACK_CI_STACK_NAME}
push: ${PROTECTED_MIRROR_PUSH_DOMAIN}/${PR_TARGET_REF_NAME}/${SPACK_CI_STACK_NAME}
source: False
binary: True
buildcache-source:
fetch: ${PROTECTED_MIRROR_FETCH_DOMAIN}/${PR_TARGET_REF_NAME}
push: ${PROTECTED_MIRROR_PUSH_DOMAIN}/${PR_TARGET_REF_NAME}
view: ${SPACK_CI_STACK_NAME}
source: False
binary: True
buildcache-destination:
fetch: ${PR_MIRROR_FETCH_DOMAIN}/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/${SPACK_CI_STACK_NAME}
push: ${PR_MIRROR_PUSH_DOMAIN}/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/${SPACK_CI_STACK_NAME}
fetch: ${PR_MIRROR_FETCH_DOMAIN}/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}
push: ${PR_MIRROR_PUSH_DOMAIN}/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}
view: ${SPACK_CI_STACK_NAME}
source: False
binary: True
11 changes: 9 additions & 2 deletions .ci/gitlab/configs/single-src-pr-mirrors.yaml.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
mirrors:
# Look at the no view top level to avoid rebuilding the world
buildcache-noview:
fetch: ${PR_MIRROR_FETCH_DOMAIN}/${CI_COMMIT_REF_NAME}
push: ${PR_MIRROR_PUSH_DOMAIN}/${CI_COMMIT_REF_NAME}
source: False
binary: True
buildcache-destination:
fetch: ${PR_MIRROR_FETCH_DOMAIN}/${CI_COMMIT_REF_NAME}/${SPACK_CI_STACK_NAME}
push: ${PR_MIRROR_PUSH_DOMAIN}/${CI_COMMIT_REF_NAME}/${SPACK_CI_STACK_NAME}
fetch: ${PR_MIRROR_FETCH_DOMAIN}/${CI_COMMIT_REF_NAME}
push: ${PR_MIRROR_PUSH_DOMAIN}/${CI_COMMIT_REF_NAME}
view: ${SPACK_CI_STACK_NAME}
source: False
binary: True
11 changes: 9 additions & 2 deletions .ci/gitlab/configs/single-src-protected-mirrors.yaml.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
mirrors:
# Look at the no view top level to avoid rebuilding the world
buildcache-noview:
fetch: ${PROTECTED_MIRROR_FETCH_DOMAIN}/${CI_COMMIT_REF_NAME}
push: ${PROTECTED_MIRROR_PUSH_DOMAIN}/${CI_COMMIT_REF_NAME}
source: False
binary: True
buildcache-destination:
fetch: ${PROTECTED_MIRROR_FETCH_DOMAIN}/${CI_COMMIT_REF_NAME}/${SPACK_CI_STACK_NAME}
push: ${PROTECTED_MIRROR_PUSH_DOMAIN}/${CI_COMMIT_REF_NAME}/${SPACK_CI_STACK_NAME}
fetch: ${PROTECTED_MIRROR_FETCH_DOMAIN}/${CI_COMMIT_REF_NAME}
push: ${PROTECTED_MIRROR_PUSH_DOMAIN}/${CI_COMMIT_REF_NAME}
view: ${SPACK_CI_STACK_NAME}
source: False
binary: True
1 change: 1 addition & 0 deletions stacks/build_systems/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ spack:
- 'uncrustify build_system=cmake'
- lz4 # MakefilePackage
- mpich~fortran # AutotoolsPackage
- mpich+fortran # AutotoolsPackage
- py-setuptools # PythonPackage
- openjpeg # CMakePackage
- r-rcpp # RPackage
Expand Down
Loading