e4s ci: use ubuntu 22.04 images (#42843)

7 files changed, 9 insertions, 28 deletions

diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
index 3ef7c2e889..19169ae79d 100644
--- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
+++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
@@ -330,7 +330,7 @@ protected-publish:
 
 e4s-generate:
   extends: [ ".e4s", ".generate-x86_64"]
-  image: ghcr.io/spack/ubuntu20.04-runner-amd64-gcc-11.4:2023.08.01
+  image: ecpe4s/ubuntu22.04-runner-amd64-gcc-11.4:2024.03.01
 
 e4s-build:
   extends: [ ".e4s", ".build" ]
@@ -353,7 +353,7 @@ e4s-build:
 
 e4s-neoverse-v2-generate:
   extends: [ ".e4s-neoverse-v2", ".generate-neoverse-v2" ]
-  image: ghcr.io/spack/ubuntu22.04-runner-arm64-gcc-11.4:2024.01.01
+  image: ecpe4s/ubuntu22.04-runner-arm64-gcc-11.4:2024.03.01
 
 e4s-neoverse-v2-build:
   extends: [ ".e4s-neoverse-v2", ".build" ]
@@ -376,7 +376,7 @@ e4s-neoverse-v2-build:
 
 e4s-neoverse_v1-generate:
   extends: [ ".e4s-neoverse_v1", ".generate-neoverse_v1" ]
-  image: ghcr.io/spack/ubuntu20.04-runner-arm64-gcc-11.4:2023.08.01
+  image: ecpe4s/ubuntu22.04-runner-arm64-gcc-11.4:2024.03.01
 
 e4s-neoverse_v1-build:
   extends: [ ".e4s-neoverse_v1", ".build" ]
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 1c5ac370ce..d70117d795 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
@@ -151,7 +151,6 @@ spack:
 
   # - alquimia            # pflotran: petsc-3.19.4-c6pmpdtpzarytxo434zf76jqdkhdyn37/lib/petsc/conf/rules:169: material_aux.o] Error 1: fortran errors
   # - amrex               # disabled temporarily pending resolution of unreproducible CI failure
-  # - archer              # subsumed by llvm +omp_tsan
   # - axom                # axom: CMake Error at axom/sidre/cmake_install.cmake:154 (file): file INSTALL cannot find "/tmp/gitlab-runner-2/spack-stage/spack-stage-axom-0.8.1-jvol6riu34vuyqvrd5ft2gyhrxdqvf63/spack-build-jvol6ri/lib/fortran/axom_spio.mod": No such file or directory.
   # - bricks              # bricks: clang-15: error: clang frontend command failed with exit code 134 (use -v to see invocation)
   # - dealii              # llvm@14.0.6: ?; intel-tbb@2020.3: clang-15: error: unknown argument: '-flifetime-dse=1'; assimp@5.2.5: clang-15: error: clang frontend command failed with exit code 134 (use -v to see invocation)
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-sles/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-sles/spack.yaml
index 96e2e1ec8d..cca20af7dd 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-sles/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-sles/spack.yaml
@@ -147,7 +147,6 @@ spack:
   # HOLDING THESE BACK UNTIL CRAY SLES CAPACITY IS EXPANDED AT UO
   # - alquimia
   # - amrex
-  # - archer
   # - axom
   # - bricks
   # - dealii
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml
index 0151c781c5..72bff87d57 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/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=neoverse_v2'
+      require: '%gcc target=neoverse_v2'
       providers:
         blas: [openblas]
         mpi: [mpich]
@@ -31,18 +31,13 @@ spack:
         +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     xz:
       variants: +pic
-    mesa:
-      version: [21.3.8]
     mpi:
       require: mpich
     mpich:
       require: '~wrapperrpath ~hwloc'
-    ncurses:
-      require: '@6.3 +termlib'
     tbb:
       require: intel-tbb
     boost:
-      version: [1.79.0]
       variants: +atomic +chrono +container +date_time +exception +filesystem +graph
         +iostreams +locale +log +math +mpi +multithreaded +program_options +random
         +regex +serialization +shared +signals +stacktrace +system +test +thread +timer
@@ -175,7 +170,6 @@ spack:
   - vtk-m
   - zfp
   # --
-  # - archer                        # part of llvm +omp_tsan
   # - bricks ~cuda                  # not respecting target=aarch64?
   # - dealii                        # slepc: make[1]: *** internal error: invalid --jobserver-auth string 'fifo:/tmp/GMfifo1313'.
   # - geopm                         # geopm: https://github.com/spack/spack/issues/38795
@@ -353,7 +347,7 @@ spack:
   ci:
     pipeline-gen:
     - build-job:
-        image: "ghcr.io/spack/ubuntu22.04-runner-arm64-gcc-11.4:2024.01.01"
+        image: ecpe4s/ubuntu22.04-runner-arm64-gcc-11.4:2024.03.01
 
   cdash:
     build-group: E4S ARM Neoverse V2
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml
index 508f816442..e7bb8ed907 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml
@@ -7,7 +7,7 @@ spack:
 
   packages:
     all:
-      require: '%gcc@11.4.0 target=neoverse_v1'
+      require: '%gcc target=neoverse_v1'
       providers:
         blas: [openblas]
         mpi: [mpich]
@@ -35,12 +35,9 @@ spack:
       require: mpich
     mpich:
       require: '~wrapperrpath ~hwloc'
-    ncurses:
-      require: '@6.3 +termlib'
     tbb:
       require: intel-tbb
     boost:
-      version: [1.79.0]
       variants: +atomic +chrono +container +date_time +exception +filesystem +graph
         +iostreams +locale +log +math +mpi +multithreaded +program_options +random
         +regex +serialization +shared +signals +stacktrace +system +test +thread +timer
@@ -173,7 +170,6 @@ spack:
   - vtk-m
   - zfp
   # --
-  # - archer                        # part of llvm +omp_tsan
   # - bricks ~cuda                  # not respecting target=aarch64?
   # - dealii                        # slepc: make[1]: *** internal error: invalid --jobserver-auth string 'fifo:/tmp/GMfifo1313'.
   # - geopm                         # geopm: https://github.com/spack/spack/issues/38795
@@ -351,7 +347,7 @@ spack:
   ci:
     pipeline-gen:
     - build-job:
-        image: "ghcr.io/spack/ubuntu20.04-runner-arm64-gcc-11.4:2023.08.01"
+        image: ecpe4s/ubuntu22.04-runner-arm64-gcc-11.4:2024.03.01
 
   cdash:
     build-group: E4S ARM Neoverse V1
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml
index da62deae14..fe5b5e75fd 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml
@@ -176,7 +176,6 @@ spack:
   - vtk-m
   - zfp
   # --
-  # - archer                                # part of llvm +omp_tsan
   # - dealii                                # fltk: https://github.com/spack/spack/issues/38791
   # - geopm                                 # geopm: https://github.com/spack/spack/issues/38798
   # - libpressio +bitgrooming +bzip2 ~cuda ~cusz +fpzip +hdf5 +libdistributed +lua +openmp +python +sz +sz3 +unix +zfp # py-numcodecs: gcc: error: unrecognized command line option '-mno-sse2'; did you mean '-mno-isel'? gcc: error: unrecognized command line option '-mno-avx2'
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
index 0295929f0d..72431e96bd 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
@@ -31,18 +31,13 @@ spack:
         +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
     xz:
       variants: +pic
-    mesa:
-      version: [21.3.8]
     mpi:
       require: mpich
     mpich:
       require: '~wrapperrpath ~hwloc'
-    ncurses:
-      require: '@6.3 +termlib'
     tbb:
       require: intel-tbb
     boost:
-      version: [1.79.0]
       variants: +atomic +chrono +container +date_time +exception +filesystem +graph
         +iostreams +locale +log +math +mpi +multithreaded +program_options +random
         +regex +serialization +shared +signals +stacktrace +system +test +thread +timer
@@ -187,7 +182,6 @@ spack:
   - vtk-m
   - zfp
   # --
-  # - archer                          # submerged into llvm +libomp_tsan
   # - geopm                           # geopm: https://github.com/spack/spack/issues/38795
 
   # PYTHON PACKAGES
@@ -315,7 +309,7 @@ spack:
 
   # ROCM NOARCH
   - hpctoolkit +rocm
-  - tau +mpi +rocm +syscall  # tau: has issue with `spack env depfile` build
+  - tau +mpi +rocm +syscall           # tau: has issue with `spack env depfile` build
 
   # ROCM 908
   - adios2 +kokkos +rocm amdgpu_target=gfx908
@@ -402,7 +396,7 @@ spack:
   ci:
     pipeline-gen:
     - build-job:
-        image: "ghcr.io/spack/ubuntu20.04-runner-amd64-gcc-11.4:2023.08.01"
+        image: ecpe4s/ubuntu22.04-runner-amd64-gcc-11.4:2024.03.01
 
   cdash:
     build-group: E4S