summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorScott Wittenburg <scott.wittenburg@kitware.com>2020-05-12 16:17:50 -0600
committerTodd Gamblin <tgamblin@llnl.gov>2020-05-14 21:11:07 -0700
commite0572a7d96402b7d3ed4f6ad373aa785a8ca76e7 (patch)
treedfbdb449efed01ba79d2157ce85effbe44a2f249 /share
parent47b3dda1aa92ab98450950ba6383282cbf158857 (diff)
downloadspack-e0572a7d96402b7d3ed4f6ad373aa785a8ca76e7.tar.gz
spack-e0572a7d96402b7d3ed4f6ad373aa785a8ca76e7.tar.bz2
spack-e0572a7d96402b7d3ed4f6ad373aa785a8ca76e7.tar.xz
spack-e0572a7d96402b7d3ed4f6ad373aa785a8ca76e7.zip
Pipelines: Support DAG scheduling and dynamic child pipelines
This change also adds a code path through the spack ci pipelines infrastructure which supports PR testing on the Spack repository. Gitlab pipelines run as a result of a PR (either creation or pushing to a PR branch) will only verify that the packages in the environment build without error. When the PR branch is merged to develop, another pipeline will run which results in the generated binaries getting pushed to the binary mirror.
Diffstat (limited to 'share')
-rw-r--r--share/spack/gitlab/pr_pipeline.yml20
-rwxr-xr-xshare/spack/spack-completion.bash10
2 files changed, 21 insertions, 9 deletions
diff --git a/share/spack/gitlab/pr_pipeline.yml b/share/spack/gitlab/pr_pipeline.yml
new file mode 100644
index 0000000000..4eb08f3434
--- /dev/null
+++ b/share/spack/gitlab/pr_pipeline.yml
@@ -0,0 +1,20 @@
+pr_pipeline:
+ only:
+ - external_pull_requests
+ variables:
+ SPACK_REPO: https://github.com/spack/spack.git
+ SPACK_REF: ${CI_EXTERNAL_PULL_REQUEST_SOURCE_BRANCH_NAME}
+ SPACK_IS_PR_PIPELINE: "True"
+ trigger:
+ project: spack/e4s
+ strategy: depend
+
+merge_pipeline:
+ only:
+ - develop
+ variables:
+ SPACK_REPO: https://github.com/spack/spack.git
+ SPACK_REF: develop
+ trigger:
+ project: spack/e4s
+ strategy: depend \ No newline at end of file
diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash
index b7b45fb0d7..49518de059 100755
--- a/share/spack/spack-completion.bash
+++ b/share/spack/spack-completion.bash
@@ -469,22 +469,14 @@ _spack_ci() {
then
SPACK_COMPREPLY="-h --help"
else
- SPACK_COMPREPLY="start generate pushyaml rebuild"
+ SPACK_COMPREPLY="generate rebuild"
fi
}
-_spack_ci_start() {
- SPACK_COMPREPLY="-h --help --output-file --copy-to --spack-repo --spack-ref --downstream-repo --branch-name --commit-sha"
-}
-
_spack_ci_generate() {
SPACK_COMPREPLY="-h --help --output-file --copy-to --spack-repo --spack-ref"
}
-_spack_ci_pushyaml() {
- SPACK_COMPREPLY="-h --help --downstream-repo --branch-name --commit-sha"
-}
-
_spack_ci_rebuild() {
SPACK_COMPREPLY="-h --help"
}