From 4c082a535784ae96ea2a9f7d384b7787f028260b Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 19 Oct 2021 17:51:37 +0200 Subject: Relax os constraints in e4s pipelines (#26547) --- share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml | 2 +- share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml | 2 +- share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml index 481a03e651..3aea593747 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml @@ -19,7 +19,7 @@ spack: - r-rcpp # RPackage - ruby-rake # RubyPackage - arch: - - '%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64' + - '%gcc target=x86_64' specs: - matrix: 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 5822860c04..e6ce31313d 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 @@ -303,7 +303,7 @@ spack: #- variorum - arch: - - '%gcc@9.3.0 arch=linux-ubuntu20.04-ppc64le' + - '%gcc target=ppc64le' specs: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml index 183195a565..f6cecd879b 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml @@ -313,7 +313,7 @@ spack: #- variorum # root fails - arch: - - '%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64' + - '%gcc target=x86_64' specs: -- cgit v1.2.3-60-g2f50