summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Wittenburg <scott.wittenburg@kitware.com>2021-09-14 14:55:50 -0600
committerGitHub <noreply@github.com>2021-09-14 14:55:50 -0600
commitbf7c12b4df4c2b5144f532b0b0600d6a1f41de8e (patch)
tree9c4d1d17b0c015b42af7bafddf1283a9cf82a711
parent56c375743aecc1adbadb63ad58bb2a50bd3d63e9 (diff)
downloadspack-bf7c12b4df4c2b5144f532b0b0600d6a1f41de8e.tar.gz
spack-bf7c12b4df4c2b5144f532b0b0600d6a1f41de8e.tar.bz2
spack-bf7c12b4df4c2b5144f532b0b0600d6a1f41de8e.tar.xz
spack-bf7c12b4df4c2b5144f532b0b0600d6a1f41de8e.zip
Pipelines: (Re)enable E4S on Power stack (#25921)
Pipelines: (Re)enable E4S on Power stack
-rw-r--r--share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml36
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml6
2 files changed, 21 insertions, 21 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
index ed3f8ab44f..f2ccfe5e51 100644
--- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
+++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
@@ -136,27 +136,27 @@ e4s-develop-build:
variables:
SPACK_CI_STACK_NAME: e4s-on-power
-# e4s-on-power-pr-generate:
-# extends: [ ".e4s-on-power", ".pr-generate", ".power-e4s-generate-tags-and-image"]
+e4s-on-power-pr-generate:
+ extends: [ ".e4s-on-power", ".pr-generate", ".power-e4s-generate-tags-and-image"]
-# e4s-on-power-develop-generate:
-# extends: [ ".e4s-on-power", ".develop-generate", ".power-e4s-generate-tags-and-image"]
+e4s-on-power-develop-generate:
+ extends: [ ".e4s-on-power", ".develop-generate", ".power-e4s-generate-tags-and-image"]
-# e4s-on-power-pr-build:
-# extends: [ ".e4s-on-power", ".pr-build" ]
-# trigger:
-# include:
-# - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
-# job: e4s-on-power-pr-generate
-# strategy: depend
+e4s-on-power-pr-build:
+ extends: [ ".e4s-on-power", ".pr-build" ]
+ trigger:
+ include:
+ - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
+ job: e4s-on-power-pr-generate
+ strategy: depend
-# e4s-on-power-develop-build:
-# extends: [ ".e4s-on-power", ".develop-build" ]
-# trigger:
-# include:
-# - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
-# job: e4s-on-power-develop-generate
-# strategy: depend
+e4s-on-power-develop-build:
+ extends: [ ".e4s-on-power", ".develop-build" ]
+ trigger:
+ include:
+ - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
+ job: e4s-on-power-develop-generate
+ strategy: depend
#########################################
# Build tests for different build-systems
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml
index aac6b19094..9bf476ad03 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml
@@ -181,7 +181,7 @@ spack:
- cuda_specs:
- amrex +cuda cuda_arch=70
- caliper +cuda cuda_arch=70
- - chai +cuda ~benchmarks ~tests cuda_arch=70 ^umpire@4.1.2 ~shared
+ - chai +cuda ~benchmarks ~tests cuda_arch=70 ^umpire~shared+cuda
- ginkgo +cuda cuda_arch=70
- hpx +cuda cuda_arch=70
- kokkos +cuda +wrapper cuda_arch=70
@@ -209,11 +209,11 @@ spack:
- archer
- argobots
- ascent
- - axom ^umpire@4.1.2
+ - axom ^umpire@5.0.1 ^raja@0.13.0
- bolt
- cabana
- caliper
- - chai ~benchmarks ~tests ^umpire@4.1.2
+ - chai ~benchmarks ~tests
- charliecloud
- conduit
- darshan-runtime