diff options
| author | Stephen Sachs <stesachs@amazon.com> | 2023-06-24 15:25:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-24 15:25:19 +0200 |
| commit | 0c6d0541f0d52ab2dcbd87f9beea2965f231196c (patch) | |
| tree | cf242a915729d11f15cb5ee37f4b711d751b76fe | |
| parent | 7b977dc103d92ee5293407c560906790ab00332b (diff) | |
| download | spack-0c6d0541f0d52ab2dcbd87f9beea2965f231196c.tar.gz spack-0c6d0541f0d52ab2dcbd87f9beea2965f231196c.tar.bz2 spack-0c6d0541f0d52ab2dcbd87f9beea2965f231196c.tar.xz spack-0c6d0541f0d52ab2dcbd87f9beea2965f231196c.zip | |
Fix syntax to set default target in aws-pcluster pipelines (#38048)
Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
5 files changed, 5 insertions, 5 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml index f46d643993..3390da07c1 100644 --- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml +++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml @@ -744,7 +744,7 @@ deprecated-ci-build: - sed -i.bkp s/"spack install gcc"/"spack install --cache-only --reuse gcc"/ postinstall.sh - diff postinstall.sh postinstall.sh.bkp || echo Done - /bin/bash postinstall.sh -fg - - spack config --scope site add "packages:all:target:\"${SPACK_TARGET_ARCH}\"" + - spack config --scope site add "packages:all:target:[${SPACK_TARGET_ARCH}]" after_script: - - mv "${CI_PROJECT_DIR}/postinstall.sh" "${CI_PROJECT_DIR}/jobs_scratch_dir/" diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-icelake/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-icelake/spack.yaml index 616d438ace..5ce6d1c869 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-icelake/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-icelake/spack.yaml @@ -48,7 +48,7 @@ spack: - spack gpg trust /bootstrap/public-key - diff /bootstrap/postinstall.sh /bootstrap/postinstall.sh.bkp || echo Done - - /bin/bash "${SPACK_ARTIFACTS_ROOT}/postinstall.sh" -fg - - spack config --scope site add "packages:all:target:\"target=${SPACK_TARGET_ARCH}\"" + - spack config --scope site add "packages:all:target:[${SPACK_TARGET_ARCH}]" - signing-job: before_script: # Do not distribute Intel & ARM binaries diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_n1/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_n1/spack.yaml index 861d9f3312..5708338a2b 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_n1/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_n1/spack.yaml @@ -50,7 +50,7 @@ spack: - spack gpg trust /bootstrap/public-key - diff /bootstrap/postinstall.sh /bootstrap/postinstall.sh.bkp || echo Done - - /bin/bash "${SPACK_ARTIFACTS_ROOT}/postinstall.sh" -fg - - spack config --scope site add "packages:all:target:\"target=${SPACK_TARGET_ARCH}\"" + - spack config --scope site add "packages:all:target:[${SPACK_TARGET_ARCH}]" - signing-job: before_script: # Do not distribute Intel & ARM binaries diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml index 9303392fb2..f2df769610 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml @@ -50,7 +50,7 @@ spack: - spack gpg trust /bootstrap/public-key - diff /bootstrap/postinstall.sh /bootstrap/postinstall.sh.bkp || echo Done - - /bin/bash "${SPACK_ARTIFACTS_ROOT}/postinstall.sh" -fg - - spack config --scope site add "packages:all:target:\"target=${SPACK_TARGET_ARCH}\"" + - spack config --scope site add "packages:all:target:[${SPACK_TARGET_ARCH}]" - signing-job: before_script: # Do not distribute Intel & ARM binaries diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-skylake/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-skylake/spack.yaml index 3c6d4872d6..029dd67351 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-skylake/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-skylake/spack.yaml @@ -48,7 +48,7 @@ spack: - spack gpg trust /bootstrap/public-key - diff /bootstrap/postinstall.sh /bootstrap/postinstall.sh.bkp || echo Done - - /bin/bash "${SPACK_ARTIFACTS_ROOT}/postinstall.sh" -fg - - spack config --scope site add "packages:all:target:\"target=${SPACK_TARGET_ARCH}\"" + - spack config --scope site add "packages:all:target:[${SPACK_TARGET_ARCH}]" - signing-job: before_script: # Do not distribute Intel & ARM binaries |