summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Wittenburg <scott.wittenburg@kitware.com>2020-05-18 19:48:38 -0600
committerScott Wittenburg <scott.wittenburg@kitware.com>2020-05-19 09:40:02 -0600
commitb1f1f5dddbb141d64e02c88985aa74365228d59b (patch)
treed911274e45b4a96a42586dd7a991377ee356a0b6
parent31ccf80294382a391743728a736574737217c23b (diff)
downloadspack-b1f1f5dddbb141d64e02c88985aa74365228d59b.tar.gz
spack-b1f1f5dddbb141d64e02c88985aa74365228d59b.tar.bz2
spack-b1f1f5dddbb141d64e02c88985aa74365228d59b.tar.xz
spack-b1f1f5dddbb141d64e02c88985aa74365228d59b.zip
Pipelines: Ensure consistent spack version for entire pipeline
Also retry jobs always, as script failure is not confined to only our spack ci rebuild command exit code.
-rw-r--r--lib/spack/spack/ci.py20
1 files changed, 4 insertions, 16 deletions
diff --git a/lib/spack/spack/ci.py b/lib/spack/spack/ci.py
index 069cbb704a..9ba7f39e45 100644
--- a/lib/spack/spack/ci.py
+++ b/lib/spack/spack/ci.py
@@ -34,18 +34,7 @@ import spack.util.web as web_util
JOB_RETRY_CONDITIONS = [
- 'unknown_failure',
- 'api_failure',
- 'stuck_or_timeout_failure',
- 'runner_system_failure',
- 'missing_dependency_failure',
- 'runner_unsupported',
- 'stale_schedule',
- 'job_execution_timeout',
- 'archived_failure',
- 'unmet_prerequisites',
- 'scheduler_failure',
- 'data_integrity_failure',
+ 'always',
]
spack_gpg = SpackCommand('gpg')
@@ -505,10 +494,9 @@ def generate_gitlab_ci_yaml(env, print_summary, output_file,
if not custom_spack_ref:
custom_spack_ref = 'master'
before_script = [
- ('git clone "{0}" --branch "{1}" --depth 1 '
- '--single-branch'.format(custom_spack_repo, custom_spack_ref)),
- # Next line just shows spack version in pipeline output
- 'pushd ./spack && git rev-parse HEAD && popd',
+ ('git clone "{0}"'.format(custom_spack_repo)),
+ 'pushd ./spack && git checkout "{0}" && popd'.format(
+ custom_spack_ref),
'. "./spack/share/spack/setup-env.sh"',
]
after_script = [