Update CI configuration

.gitlab-ci.yml

@@ -2,42 +2,61 @@
 variables:
   DUNECI_TEST_LABELS: quick
 
-debian:10--gcc--expensive:
+before_script:
+  - . /duneci/bin/duneci-init-job
+
+debian:10 gcc-7-14--expensive:
   # This image has Vc
-  image: duneci/base:10
+  image: registry.dune-project.org/docker/ci/debian:10
   script: duneci-standard-test
   # allow expensive tests
-  variables: {DUNECI_TEST_LABELS: ""}
+  variables:
+    DUNECI_TEST_LABELS: ""
+    DUNECI_TOOLCHAIN: gcc-7-14
   # require AVX to properly test Vc
   tags: [duneci, "iset:avx"]
   # allowed to fail to e.g. do no hold up a merge when a runner supporting avx
   # is unavailable
   allow_failure: true
 
-debian:10  gcc:c++17:
-  image: duneci/base:10
+debian:10 gcc-8-17:
+  image: registry.dune-project.org/docker/ci/debian:10
+  script: duneci-standard-test
+  variables:
+    DUNECI_TOOLCHAIN: gcc-8-17
+  tags: [duneci]
+
+debian:10 clang-6-libcpp-17:
+  image: registry.dune-project.org/docker/ci/debian:10
   script: duneci-standard-test
-  variables: {DUNECI_OPTS: /duneci/opts.gcc.c++17}
+  variables:
+    DUNECI_TOOLCHAIN: clang-6-libcpp-17
   tags: [duneci]
 
-debian:9--gcc:
-  image: duneci/base:9
+debian:9 gcc-6-14:
+  image: registry.dune-project.org/docker/ci/debian:9
   script: duneci-standard-test
+  variables:
+    DUNECI_TOOLCHAIN: gcc-6-14
   tags: [duneci]
 
-debian:9--clang:
-  image: duneci/base:9
+debian:9 clang-3.8-14:
+  image: registry.dune-project.org/docker/ci/debian:9
   script: duneci-standard-test
-  variables: {DUNECI_OPTS: /duneci/opts.clang}
+  variables:
+    DUNECI_TOOLCHAIN: clang-3.8-14
   tags: [duneci]
 
-ubuntu:16.04--gcc:
-  image: duneci/base:16.04
+ubuntu:16.04 gcc-5-14:
+  image: registry.dune-project.org/docker/ci/ubuntu:16.04
   script: duneci-standard-test
+  variables:
+    DUNECI_TOOLCHAIN: gcc-5-14
   tags: [duneci]
 
-ubuntu:16.04--clang:
-  image: duneci/base:16.04
+ubuntu:18.04 clang-6-17:
+  image: registry.dune-project.org/docker/ci/ubuntu:18.04
   script: duneci-standard-test
-  variables: {DUNECI_OPTS: /duneci/opts.clang}
+  variables:
+    DUNECI_TOOLCHAIN: clang-6-17
   tags: [duneci]