summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml3
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml4
2 files changed, 5 insertions, 2 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
index 413fdf34eb..c96ddafc08 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
@@ -10,7 +10,8 @@ spack:
packages:
all:
- require: '%cce'
+ require:
+ - any_of: ["%cce", "@:"] # cce as a strong preference; not all packages support it
compiler: [cce]
providers:
blas: [cray-libsci]
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
index 2e10267f36..85e23abac4 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
@@ -7,7 +7,9 @@ spack:
packages:
all:
- require: '%oneapi target=x86_64_v3'
+ require:
+ - any_of: ["%oneapi", "@:"] # oneapi as a strong preference; not all packages support it
+ - "target=x86_64_v3"
providers:
blas: [openblas]
mpi: [mpich]