summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Wittenburg <scott.wittenburg@kitware.com>2021-02-23 19:19:06 -0700
committerGitHub <noreply@github.com>2021-02-23 19:19:06 -0700
commitee5992783cbd9d9aecb47dbc6a0fc85b882ad02a (patch)
tree2a435e5c045a45a0d69e8a25137e0837975eb217
parenta7ddaa67de87c8271f9d8da9741d059604268500 (diff)
downloadspack-ee5992783cbd9d9aecb47dbc6a0fc85b882ad02a.tar.gz
spack-ee5992783cbd9d9aecb47dbc6a0fc85b882ad02a.tar.bz2
spack-ee5992783cbd9d9aecb47dbc6a0fc85b882ad02a.tar.xz
spack-ee5992783cbd9d9aecb47dbc6a0fc85b882ad02a.zip
Gitlab fix pr workflow (#21786)
Fixes for gitlab pipelines * Remove accidentally retained testing branch name * Generate pipeline w/out debug mode * Make jobs interruptible for auto-cancel pending * Work around concretization conflicts
-rw-r--r--lib/spack/spack/ci.py3
-rw-r--r--share/spack/gitlab/cloud_e4s_pipelines/.gitlab-ci.yml5
-rw-r--r--share/spack/gitlab/cloud_e4s_pipelines/stacks/e4s/spack.yaml4
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/spack/spack/ci.py b/lib/spack/spack/ci.py
index e853dc9f98..b0e0b25191 100644
--- a/lib/spack/spack/ci.py
+++ b/lib/spack/spack/ci.py
@@ -866,7 +866,8 @@ def generate_gitlab_ci_yaml(env, print_summary, output_file, prune_dag=False,
'retry': {
'max': 2,
'when': JOB_RETRY_CONDITIONS,
- }
+ },
+ 'interruptible': True
}
length_needs = len(job_dependencies)
diff --git a/share/spack/gitlab/cloud_e4s_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_e4s_pipelines/.gitlab-ci.yml
index 6f26eaf574..346b07ac15 100644
--- a/share/spack/gitlab/cloud_e4s_pipelines/.gitlab-ci.yml
+++ b/share/spack/gitlab/cloud_e4s_pipelines/.gitlab-ci.yml
@@ -7,17 +7,17 @@ stages: [generate, build]
- spack --version
- cd share/spack/gitlab/cloud_e4s_pipelines/stacks/e4s
- spack env activate --without-view .
- - spack -d ci generate --check-index-only
+ - spack ci generate --check-index-only
--output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/e4s_pipeline.yml"
artifacts:
paths:
- "${CI_PROJECT_DIR}/jobs_scratch_dir/e4s_pipeline.yml"
tags: ["spack", "public", "medium"]
+ interruptible: true
e4s-pr-generate:
only:
- /^github\/pr[\d]+_.*$/
- - move-pr-stack-into-spack
extends: .generate
before_script:
- export SPACK_PR_BRANCH=${CI_COMMIT_REF_NAME}
@@ -33,7 +33,6 @@ e4s-develop-generate:
e4s-pr-build:
only:
- /^github\/pr[\d]+_.*$/
- - move-pr-stack-into-spack
stage: build
trigger:
include:
diff --git a/share/spack/gitlab/cloud_e4s_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_e4s_pipelines/stacks/e4s/spack.yaml
index fc5dad423b..d43ed47693 100644
--- a/share/spack/gitlab/cloud_e4s_pipelines/stacks/e4s/spack.yaml
+++ b/share/spack/gitlab/cloud_e4s_pipelines/stacks/e4s/spack.yaml
@@ -88,10 +88,10 @@ spack:
- raja
- rempi
- scr
- - slate ^openblas@0.3.5 threads=openmp ^cuda@10.2.89
+ - slate ^openblas@0.3.6 threads=openmp ^cuda@10.2.89
- slepc
- stc
- - strumpack ~slate
+ - strumpack ~slate ^openblas@0.3.6 threads=openmp
- sundials
- superlu
- superlu-dist