From 2292e8aa54af27ab78647777d2fcf1b48f404827 Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Wed, 22 May 2024 00:37:16 +0200
Subject: [PATCH] Update CI config (uses ubuntu:jammy, cmake-3.22 clang11 and
 g++10)

---
 .gitlab-ci.yml                     |  4 ++--
 .gitlab-ci/clang10-mpi-debug.yml   | 15 ---------------
 .gitlab-ci/clang10-mpi-release.yml | 15 ---------------
 .gitlab-ci/clang11-mpi-debug.yml   | 15 +++++++++++++++
 .gitlab-ci/clang11-mpi-release.yml | 15 +++++++++++++++
 .gitlab-ci/gcc10-mpi-coverage.yml  |  2 +-
 .gitlab-ci/gcc10-mpi-release.yml   |  2 +-
 .gitlab-ci/gcc10-seq-coverage.yml  |  2 +-
 .gitlab-ci/gcc10-seq-release.yml   |  2 +-
 9 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 .gitlab-ci/clang10-mpi-debug.yml
 delete mode 100644 .gitlab-ci/clang10-mpi-release.yml
 create mode 100644 .gitlab-ci/clang11-mpi-debug.yml
 create mode 100644 .gitlab-ci/clang11-mpi-release.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02c2d48ce..1a7ed48ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,8 @@ variables:
   CTEST_OUTPUT_ON_FAILURE: 1
 
 include:
-  - local: '/.gitlab-ci/clang10-mpi-debug.yml'
-  - local: '/.gitlab-ci/clang10-mpi-release.yml'
+  - local: '/.gitlab-ci/clang11-mpi-debug.yml'
+  - local: '/.gitlab-ci/clang11-mpi-release.yml'
   - local: '/.gitlab-ci/gcc10-mpi-coverage.yml'
   - local: '/.gitlab-ci/gcc10-mpi-release.yml'
   - local: '/.gitlab-ci/gcc10-seq-coverage.yml'
diff --git a/.gitlab-ci/clang10-mpi-debug.yml b/.gitlab-ci/clang10-mpi-debug.yml
deleted file mode 100644
index a757e02d4..000000000
--- a/.gitlab-ci/clang10-mpi-debug.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-test:clang10-mpi-debug:
-  image: localhost:5000/ubuntu_clang10_mpi
-  stage: test
-  needs: []
-  script:
-    - mkdir -p build/clang10-debug-mpi
-    - cd build/clang10-debug-mpi
-    - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
-    - make -j 4
-    - make check
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-clang10-debug-mpi"
-    paths:
-      - build/clang10-debug-mpi
-    untracked: true
diff --git a/.gitlab-ci/clang10-mpi-release.yml b/.gitlab-ci/clang10-mpi-release.yml
deleted file mode 100644
index 3172c1c2c..000000000
--- a/.gitlab-ci/clang10-mpi-release.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-test:clang10-mpi-release:
-  image: localhost:5000/ubuntu_clang10_mpi
-  stage: test
-  needs: []
-  script:
-    - mkdir -p build/clang10-release-mpi
-    - cd build/clang10-release-mpi
-    - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-10
-    - make -j 4
-    - make check
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-clang10-release-mpi"
-    paths:
-      - build/clang10-release-mpi
-    untracked: true
diff --git a/.gitlab-ci/clang11-mpi-debug.yml b/.gitlab-ci/clang11-mpi-debug.yml
new file mode 100644
index 000000000..3e8ad009f
--- /dev/null
+++ b/.gitlab-ci/clang11-mpi-debug.yml
@@ -0,0 +1,15 @@
+test:clang11-mpi-debug:
+  image: localhost:5000/ubuntu_jammy_clang11_mpi
+  stage: test
+  needs: []
+  script:
+    - mkdir -p build/clang11-debug-mpi
+    - cd build/clang11-debug-mpi
+    - CXX=clang++-11 CC=clang-11 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
+    - make -j 4
+    - make check
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}-clang11-debug-mpi"
+    paths:
+      - build/clang11-debug-mpi
+    untracked: true
diff --git a/.gitlab-ci/clang11-mpi-release.yml b/.gitlab-ci/clang11-mpi-release.yml
new file mode 100644
index 000000000..7c034bf86
--- /dev/null
+++ b/.gitlab-ci/clang11-mpi-release.yml
@@ -0,0 +1,15 @@
+test:clang11-mpi-release:
+  image: localhost:5000/ubuntu_jammy_clang11_mpi
+  stage: test
+  needs: []
+  script:
+    - mkdir -p build/clang11-release-mpi
+    - cd build/clang11-release-mpi
+    - CXX=clang++-11 CC=clang-11 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-11
+    - make -j 4
+    - make check
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}-clang11-release-mpi"
+    paths:
+      - build/clang11-release-mpi
+    untracked: true
diff --git a/.gitlab-ci/gcc10-mpi-coverage.yml b/.gitlab-ci/gcc10-mpi-coverage.yml
index 9881eb7d1..e3b178d1a 100644
--- a/.gitlab-ci/gcc10-mpi-coverage.yml
+++ b/.gitlab-ci/gcc10-mpi-coverage.yml
@@ -1,5 +1,5 @@
 coverage:gcc10-mpi-coverage:
-  image: localhost:5000/ubuntu_gcc10_mpi
+  image: localhost:5000/ubuntu_jammy_gcc10_mpi
   stage: coverage
   needs: []
   script:
diff --git a/.gitlab-ci/gcc10-mpi-release.yml b/.gitlab-ci/gcc10-mpi-release.yml
index 198fe1785..ef5be1ee5 100644
--- a/.gitlab-ci/gcc10-mpi-release.yml
+++ b/.gitlab-ci/gcc10-mpi-release.yml
@@ -1,5 +1,5 @@
 test:gcc10-mpi-release:
-  image: localhost:5000/ubuntu_gcc10_mpi
+  image: localhost:5000/ubuntu_jammy_gcc10_mpi
   stage: test
   needs: []
   script:
diff --git a/.gitlab-ci/gcc10-seq-coverage.yml b/.gitlab-ci/gcc10-seq-coverage.yml
index 421d47af5..96c5a3b79 100644
--- a/.gitlab-ci/gcc10-seq-coverage.yml
+++ b/.gitlab-ci/gcc10-seq-coverage.yml
@@ -1,5 +1,5 @@
 coverage:gcc10-seq-coverage:
-  image: localhost:5000/ubuntu_gcc10
+  image: localhost:5000/ubuntu_jammy_gcc10
   stage: coverage
   needs: []
   script:
diff --git a/.gitlab-ci/gcc10-seq-release.yml b/.gitlab-ci/gcc10-seq-release.yml
index 8a34f11b0..298124599 100644
--- a/.gitlab-ci/gcc10-seq-release.yml
+++ b/.gitlab-ci/gcc10-seq-release.yml
@@ -1,5 +1,5 @@
 test:gcc10-seq-release:
-  image: localhost:5000/ubuntu_gcc10
+  image: localhost:5000/ubuntu_jammy_gcc10
   stage: test
   needs: []
   script:
-- 
GitLab