diff options
| -rw-r--r-- | share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml | 36 | ||||
| -rw-r--r-- | share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml | 6 |
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 |