diff options
author | eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> | 2024-01-20 16:28:29 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-20 16:28:29 -0800 |
commit | 104a2b5e11d0f7eb8bbae12dba53143488acf94e (patch) | |
tree | 2e0e6125c5e699bb2433c9e7ac95e9ddb267d579 | |
parent | e198c1316178fa8d3bcb9741d3baea5f625e8ebc (diff) | |
download | spack-104a2b5e11d0f7eb8bbae12dba53143488acf94e.tar.gz spack-104a2b5e11d0f7eb8bbae12dba53143488acf94e.tar.bz2 spack-104a2b5e11d0f7eb8bbae12dba53143488acf94e.tar.xz spack-104a2b5e11d0f7eb8bbae12dba53143488acf94e.zip |
e4s ci: switch to neoverse_v2 target (#42115)
-rw-r--r-- | share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml | 24 | ||||
-rw-r--r-- | share/spack/gitlab/cloud_pipelines/configs/linux/neoverse_v2/ci.yaml | 7 | ||||
-rw-r--r-- | share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml (renamed from share/spack/gitlab/cloud_pipelines/stacks/e4s-aarch64/spack.yaml) | 4 |
3 files changed, 23 insertions, 12 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml index 3caf86f169..1dc5fca827 100644 --- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml +++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml @@ -207,6 +207,10 @@ default: extends: [ ".generate-base" ] tags: ["spack", "public", "medium", "aarch64", "graviton3"] +.generate-neoverse-v2: + extends: [ ".generate-base" ] + tags: ["spack", "public", "medium", "neoverse_v2"] + .generate-deprecated: extends: [ ".base-job" ] stage: generate @@ -340,27 +344,27 @@ e4s-build: job: e4s-generate ######################################## -# E4S aarch64 pipeline +# E4S Neoverse V2 ######################################## -.e4s-aarch64: - extends: [ ".linux_aarch64" ] +.e4s-neoverse-v2: + extends: [ ".linux_neoverse_v2" ] variables: - SPACK_CI_STACK_NAME: e4s-aarch64 + SPACK_CI_STACK_NAME: e4s-neoverse-v2 -e4s-aarch64-generate: - extends: [ ".e4s-aarch64", ".generate-aarch64" ] +e4s-neoverse-v2-generate: + extends: [ ".e4s-neoverse-v2", ".generate-neoverse-v2" ] image: ecpe4s/ubuntu22.04-runner-arm64-gcc-11.4:2024.01.01 -e4s-aarch64-build: - extends: [ ".e4s-aarch64", ".build" ] +e4s-neoverse-v2-build: + extends: [ ".e4s-neoverse-v2", ".build" ] trigger: include: - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml - job: e4s-aarch64-generate + job: e4s-neoverse-v2-generate strategy: depend needs: - artifacts: True - job: e4s-aarch64-generate + job: e4s-neoverse-v2-generate ######################################## # E4S Neoverse V1 pipeline diff --git a/share/spack/gitlab/cloud_pipelines/configs/linux/neoverse_v2/ci.yaml b/share/spack/gitlab/cloud_pipelines/configs/linux/neoverse_v2/ci.yaml new file mode 100644 index 0000000000..b5136835b2 --- /dev/null +++ b/share/spack/gitlab/cloud_pipelines/configs/linux/neoverse_v2/ci.yaml @@ -0,0 +1,7 @@ +ci: + pipeline-gen: + - any-job: + variables: + SPACK_TARGET_ARCH: neoverse_v2 + - build-job: + tags: ["neoverse_v2"] diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-aarch64/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml index 3a1873751b..3d6c957da8 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-aarch64/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml @@ -7,7 +7,7 @@ spack: packages: all: - require: '%gcc@11.4.0 target=aarch64' + require: '%gcc@11.4.0 target=neoverse_v2' providers: blas: [openblas] mpi: [mpich] @@ -332,4 +332,4 @@ spack: image: "ecpe4s/ubuntu22.04-runner-arm64-gcc-11.4:2024.01.01" cdash: - build-group: E4S ARM AARCH64 + build-group: E4S ARM Neoverse V2 |