updates images, toolchains

.gitlab-ci.yml

@@ -7,7 +7,7 @@ image: gitlab-registry.mpcdf.mpg.de/mpcdf/module-image:latest
 
 .load_modules: &load_modules |
     module purge
-    module load cmake ${COMPILER} ${MPI} gsl hdf5-mpi/1.14.1 fftw-mpi anaconda/3/2023.03
+    module load cmake ${COMPILER} ${MPI} gsl hdf5-mpi fftw-mpi anaconda/3/2023.03
     export FFTW_DIR=$FFTW_HOME
 
 .build: &build |
@@ -32,22 +32,20 @@ image: gitlab-registry.mpcdf.mpg.de/mpcdf/module-image:latest
     export CXX=${GCC_HOME}/bin/g++
 
 .export_INTEL_compilers: &export_INTEL_compilers |
-    export CC=icc
-    export CXX=icpc
+    export CC=icx
+    export CXX=icpx
 
-#.allow_docker_run_as_root: &allow_docker_run_as_root |
-#    export OMPI_ALLOW_RUN_AS_ROOT=1
-#    export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
 
 build-gcc-openmpi:
+    image: gitlab-registry.mpcdf.mpg.de/mpcdf/ci-module-image/gcc_13-openmpi_4_1
     stage: build
     script:
       - *load_modules
       - *export_GCC_compilers
       - *build
     variables:
-      COMPILER: "gcc/11"
-      MPI: "openmpi/4"
+      COMPILER: "gcc/13"
+      MPI: "openmpi/4.1"
     tags:
       - docker
     artifacts:
@@ -57,6 +55,7 @@ build-gcc-openmpi:
         when: always
 
 build-gcc-impi:
+    image: gitlab-registry.mpcdf.mpg.de/mpcdf/ci-module-image/gcc_13-impi_2021_9
     stage: build
     script:
       - *load_modules
@@ -65,8 +64,8 @@ build-gcc-impi:
         export MPI_HOME=${I_MPI_ROOT}
       - *build
     variables:
-      COMPILER: "gcc/11"
-      MPI: "impi/2021.7"
+      COMPILER: "gcc/13"
+      MPI: "impi/2021.9"
     tags:
       - docker
     artifacts:
@@ -76,6 +75,7 @@ build-gcc-impi:
         when: always
 
 build-intel:
+    image: gitlab-registry.mpcdf.mpg.de/mpcdf/ci-module-image/intel_2023_1_0_x-impi_2021_9
     stage: build
     script:
       - *load_modules
@@ -84,8 +84,8 @@ build-intel:
         export MPI_HOME=${I_MPI_ROOT}
       - *build
     variables:
-      COMPILER: "intel/21.7.1"
-      MPI: "impi/2021.7"
+      COMPILER: "intel/2023.1.0.x"
+      MPI: "impi/2021.9"
     tags:
       - docker
     artifacts:
@@ -95,6 +95,7 @@ build-intel:
         when: always
 
 test-gcc-impi:
+    image: gitlab-registry.mpcdf.mpg.de/mpcdf/ci-module-image/gcc_13-impi_2021_9
     stage: test
     script:
       - *load_modules
@@ -105,29 +106,14 @@ test-gcc-impi:
     tags:
       - docker
     variables:
-      COMPILER: "gcc/11"
-      MPI: "impi/2021.7"
+      COMPILER: "gcc/13"
+      MPI: "impi/2021.9"
     needs:
         - job: build-gcc-impi
           artifacts: true
 
-#test-gcc-openmpi:
-#    stage: test
-#    script:
-#      - *load_modules
-#      - *export_GCC_compilers
-#      - *allow_docker_run_as_root
-#      - *run_tests
-#    tags:
-#      - docker
-#    variables:
-#      COMPILER: "gcc"
-#      MPI: "openmpi"
-#    needs:
-#        - job: build-gcc-openmpi
-#          artifacts: true
-
 test-intel:
+    image: gitlab-registry.mpcdf.mpg.de/mpcdf/ci-module-image/intel_2023_1_0_x-impi_2021_9
     stage: test
     script:
       - *load_modules
@@ -138,8 +124,8 @@ test-intel:
     tags:
       - docker
     variables:
-      COMPILER: "intel/21.7.1"
-      MPI: "impi/2021.7"
+      COMPILER: "intel/2023.1.0.x"
+      MPI: "impi/2021.9"
     needs:
         - job: build-intel
           artifacts: true
@@ -160,8 +146,8 @@ build-doc:
     tags:
       - docker
     variables:
-      COMPILER: "gcc/11"
-      MPI: "impi/2021.7"
+      COMPILER: "gcc/13"
+      MPI: "impi/2021.9"
     artifacts:
         paths:
             - build-doc/