From 9cbe954b7c61d19cb06cee86c81e2b79abb3773a Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <Ansgar.Burchardt@tu-dresden.de>
Date: Tue, 18 Oct 2016 18:30:45 +0200
Subject: [PATCH] Update test environments

- No longer test with clang 3.5.
- Add clang 3.8 from Debian 8 + backports
- Add gcc 5.4 + clang 3.8 from Ubuntu 16.04 LTS.
- Use `duneci-standard-test`
---
 .gitlab-ci.yml | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 387e0a4ab6..2d566103f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,28 +6,24 @@ before_script:
 
 debian:9--gcc:
   image: duneci/base:9
-  script:
-  - dunecontrol --current --opts=/duneci/opts.gcc all
-  - dunecontrol --current make build_tests
-  - cd build-cmake; duneci-ctest
+  script: duneci-standard-test
 
 debian:9--clang:
   image: duneci/base:9
-  script:
-  - dunecontrol --current --opts=/duneci/opts.clang all
-  - dunecontrol --current make build_tests
-  - cd build-cmake; duneci-ctest
+  script: duneci-standard-test --opts=/duneci/opts.clang
 
 debian:8--gcc:
   image: duneci/base:8
-  script:
-  - dunecontrol --current --opts=/duneci/opts.gcc all
-  - dunecontrol --current make build_tests
-  - cd build-cmake; duneci-ctest
+  script: duneci-standard-test
 
-debian:8--clang:
-  image: duneci/base:8
-  script:
-  - dunecontrol --current --opts=/duneci/opts.clang all
-  - dunecontrol --current make build_tests
-  - cd build-cmake; duneci-ctest
+debian:8-backports--clang:
+  image: duneci/base:8-backports
+  script: duneci-standard-test --opts=/duneci/opts.clang
+
+ubuntu:16.04--gcc:
+  image: duneci/base:16.04
+  script: duneci-standard-test
+
+ubuntu:16.04--clang:
+  image: duneci/base:16.04
+  script: duneci-standard-test --opts=/duneci/opts.clang
-- 
GitLab