From 1a18e868360620afdd1a460e49339c13402a1c08 Mon Sep 17 00:00:00 2001
From: Sebastian Eibl <sebastian.eibl@fau.de>
Date: Fri, 8 Jun 2018 13:30:05 +0200
Subject: [PATCH] fixed issues with cuda builds

missing cuda tag now implies WALBERLA_BUILD_WITH_CUDA=OFF
---
 .gitlab-ci.yml | 564 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 393 insertions(+), 171 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 790b5133b..76301cde4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,99 +36,87 @@ stages:
       - docker
 
 
-.build_serial_template: &build_serial_definition
-   <<: *build_definition
-   variables:
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      CMAKE_BUILD_TYPE: "Release"
-      WALBERLA_BUFFER_DEBUG: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-
-
-.build_mpionly_template: &build_mpionly_definition
-   <<: *build_definition
-   variables:
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      CMAKE_BUILD_TYPE: "Release"
-      WALBERLA_BUFFER_DEBUG: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-
-
-.build_hybrid_template: &build_hybrid_definition
-   <<: *build_definition
-   variables:
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "ON"
-      OMP_NUM_THREADS: "4"
-      OMP_WAIT_POLICY: "PASSIVE"
-      CMAKE_BUILD_TYPE: "Release"
-      WALBERLA_BUFFER_DEBUG: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-      WALBERLA_BUILD_WITH_METIS: "ON"
-      WALBERLA_BUILD_WITH_PARMETIS: "ON"
-
-.build_serial_dbg_template: &build_serial_dbg_definition
-   <<: *build_definition
-   variables:
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_BUFFER_DEBUG: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-
-
-.build_mpionly_dbg_template: &build_mpionly_dbg_definition
-   <<: *build_definition
-   variables:
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_BUFFER_DEBUG: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-
-
-.build_hybrid_dbg_template: &build_hybrid_dbg_definition
-   <<: *build_definition
-   variables:
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "ON"
-      OMP_NUM_THREADS: "4"
-      OMP_WAIT_POLICY: "PASSIVE"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_BUFFER_DEBUG: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-      WALBERLA_BUILD_WITH_METIS: "ON"
-      WALBERLA_BUILD_WITH_PARMETIS: "ON"
-
-.build_hybrid_dbg_sp_template: &build_hybrid_dbg_sp_definition
-   <<: *build_definition
-   variables:
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "ON"
-      OMP_NUM_THREADS: "4"
-      OMP_WAIT_POLICY: "PASSIVE"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_BUFFER_DEBUG: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "OFF"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+.variables: &build_serial_variables
+   CTEST_EXCLUDE_LABELS: "longrun"
+   WALBERLA_BUILD_WITH_MPI: "OFF"
+   WALBERLA_BUILD_WITH_OPENMP: "OFF"
+   CMAKE_BUILD_TYPE: "Release"
+   WALBERLA_BUFFER_DEBUG: "OFF"
+   WALBERLA_DOUBLE_ACCURACY: "ON"
+   WALBERLA_BUILD_WITH_METIS: "OFF"
+   WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+
+
+.variables: &build_mpionly_variables
+   CTEST_EXCLUDE_LABELS: "longrun"
+   WALBERLA_BUILD_WITH_MPI: "ON"
+   WALBERLA_BUILD_WITH_OPENMP: "OFF"
+   CMAKE_BUILD_TYPE: "Release"
+   WALBERLA_BUFFER_DEBUG: "OFF"
+   WALBERLA_DOUBLE_ACCURACY: "ON"
+   WALBERLA_BUILD_WITH_METIS: "OFF"
+   WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+
+
+.variables: &build_hybrid_variables
+   CTEST_EXCLUDE_LABELS: "longrun"
+   WALBERLA_BUILD_WITH_MPI: "ON"
+   WALBERLA_BUILD_WITH_OPENMP: "ON"
+   OMP_NUM_THREADS: "4"
+   OMP_WAIT_POLICY: "PASSIVE"
+   CMAKE_BUILD_TYPE: "Release"
+   WALBERLA_BUFFER_DEBUG: "OFF"
+   WALBERLA_DOUBLE_ACCURACY: "ON"
+   WALBERLA_BUILD_WITH_METIS: "ON"
+   WALBERLA_BUILD_WITH_PARMETIS: "ON"
+
+
+.variables: &build_serial_dbg_variables
+   CTEST_EXCLUDE_LABELS: "longrun"
+   WALBERLA_BUILD_WITH_MPI: "OFF"
+   WALBERLA_BUILD_WITH_OPENMP: "OFF"
+   CMAKE_BUILD_TYPE: "DebugOptimized"
+   WALBERLA_BUFFER_DEBUG: "OFF"
+   WALBERLA_DOUBLE_ACCURACY: "ON"
+   WALBERLA_BUILD_WITH_METIS: "OFF"
+   WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+
+
+.variables: &build_mpionly_dbg_variables
+   CTEST_EXCLUDE_LABELS: "longrun"
+   WALBERLA_BUILD_WITH_MPI: "ON"
+   WALBERLA_BUILD_WITH_OPENMP: "OFF"
+   CMAKE_BUILD_TYPE: "DebugOptimized"
+   WALBERLA_BUFFER_DEBUG: "OFF"
+   WALBERLA_DOUBLE_ACCURACY: "ON"
+   WALBERLA_BUILD_WITH_METIS: "OFF"
+   WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+
+
+.variables: &build_hybrid_dbg_variables
+   CTEST_EXCLUDE_LABELS: "longrun"
+   WALBERLA_BUILD_WITH_MPI: "ON"
+   WALBERLA_BUILD_WITH_OPENMP: "ON"
+   OMP_NUM_THREADS: "4"
+   OMP_WAIT_POLICY: "PASSIVE"
+   CMAKE_BUILD_TYPE: "DebugOptimized"
+   WALBERLA_BUFFER_DEBUG: "OFF"
+   WALBERLA_DOUBLE_ACCURACY: "ON"
+   WALBERLA_BUILD_WITH_METIS: "ON"
+   WALBERLA_BUILD_WITH_PARMETIS: "ON"
+
+
+.variables: &build_hybrid_dbg_sp_variables
+   CTEST_EXCLUDE_LABELS: "longrun"
+   WALBERLA_BUILD_WITH_MPI: "ON"
+   WALBERLA_BUILD_WITH_OPENMP: "ON"
+   OMP_NUM_THREADS: "4"
+   OMP_WAIT_POLICY: "PASSIVE"
+   CMAKE_BUILD_TYPE: "DebugOptimized"
+   WALBERLA_BUFFER_DEBUG: "OFF"
+   WALBERLA_DOUBLE_ACCURACY: "OFF"
+   WALBERLA_BUILD_WITH_METIS: "OFF"
+   WALBERLA_BUILD_WITH_PARMETIS: "OFF"
 
 
 ###############################################################################
@@ -140,8 +128,11 @@ stages:
 
 
 intel_16_serial:
-   <<: *build_serial_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -150,8 +141,11 @@ intel_16_serial:
       - intel
 
 intel_16_mpionly:
-   <<: *build_mpionly_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -160,8 +154,11 @@ intel_16_mpionly:
       - intel
 
 intel_16_hybrid:
-   <<: *build_hybrid_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   variables:
+      <<: *build_hybrid_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -170,8 +167,11 @@ intel_16_hybrid:
       - intel
 
 intel_16_serial_dbg:
-   <<: *build_serial_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -180,8 +180,11 @@ intel_16_serial_dbg:
       - intel
 
 intel_16_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -190,16 +193,22 @@ intel_16_mpionly_dbg:
       - intel
 
 intel_16_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   variables:
+      <<: *build_hybrid_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    tags:
       - cuda
       - docker
       - intel
 
 intel_16_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   variables:
+      <<: *build_hybrid_dbg_sp_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -208,8 +217,11 @@ intel_16_hybrid_dbg_sp:
       - intel
 
 intel_17_serial:
-   <<: *build_serial_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
@@ -217,8 +229,11 @@ intel_17_serial:
       - intel
 
 intel_17_mpionly:
-   <<: *build_mpionly_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
@@ -226,43 +241,61 @@ intel_17_mpionly:
       - intel
 
 intel_17_hybrid:
-   <<: *build_hybrid_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+   variables:
+      <<: *build_hybrid_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
       - intel
 
 intel_17_serial_dbg:
-   <<: *build_serial_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
       - intel
 
 intel_17_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
       - intel
 
 intel_17_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+   variables:
+      <<: *build_hybrid_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
       - intel
 
 intel_17_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+   variables:
+      <<: *build_hybrid_dbg_sp_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
       - intel
 
 gcc_5_serial:
-   <<: *build_serial_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -270,8 +303,11 @@ gcc_5_serial:
       - docker
 
 gcc_5_mpionly:
-   <<: *build_mpionly_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -279,22 +315,31 @@ gcc_5_mpionly:
       - docker
 
 gcc_5_hybrid:
-   <<: *build_hybrid_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+   variables:
+      <<: *build_hybrid_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    tags:
       - cuda
       - docker
 
 gcc_5_serial_dbg:
-   <<: *build_serial_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    tags:
       - cuda
       - docker
 
 gcc_5_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -302,15 +347,21 @@ gcc_5_mpionly_dbg:
       - docker
 
 gcc_5_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+   variables:
+      <<: *build_hybrid_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    tags:
       - cuda
       - docker
 
 gcc_5_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+   variables:
+      <<: *build_hybrid_dbg_sp_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -318,110 +369,155 @@ gcc_5_hybrid_dbg_sp:
       - docker
 
 gcc_6_serial:
-   <<: *build_serial_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 gcc_6_mpionly:
-   <<: *build_mpionly_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 gcc_6_hybrid:
-   <<: *build_hybrid_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+   variables:
+      <<: *build_hybrid_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 gcc_6_serial_dbg:
-   <<: *build_serial_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 gcc_6_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 gcc_6_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+   variables:
+      <<: *build_hybrid_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 gcc_6_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+   variables:
+      <<: *build_hybrid_dbg_sp_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 gcc_7_serial:
-   <<: *build_serial_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 gcc_7_mpionly:
-   <<: *build_mpionly_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 gcc_7_hybrid:
-   <<: *build_hybrid_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   variables:
+      <<: *build_hybrid_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
 
 gcc_7_serial_dbg:
-   <<: *build_serial_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
 
 gcc_7_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
 
 gcc_7_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   variables:
+      <<: *build_hybrid_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
 
 gcc_7_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   variables:
+      <<: *build_hybrid_dbg_sp_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
 
 clang_3.6_serial:
-   <<: *build_serial_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -429,8 +525,11 @@ clang_3.6_serial:
       - docker
 
 clang_3.6_mpionly:
-   <<: *build_mpionly_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -438,8 +537,11 @@ clang_3.6_mpionly:
       - docker
 
 clang_3.6_serial_dbg:
-   <<: *build_serial_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -447,15 +549,21 @@ clang_3.6_serial_dbg:
       - docker
 
 clang_3.6_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    tags:
       - cuda
       - docker
 
 clang_3.7_serial:
-   <<: *build_serial_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -463,8 +571,11 @@ clang_3.7_serial:
       - docker
 
 clang_3.7_mpionly:
-   <<: *build_mpionly_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -472,8 +583,11 @@ clang_3.7_mpionly:
       - docker
 
 clang_3.7_serial_dbg:
-   <<: *build_serial_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -481,8 +595,11 @@ clang_3.7_serial_dbg:
       - docker
 
 clang_3.7_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -490,8 +607,11 @@ clang_3.7_mpionly_dbg:
       - docker
 
 clang_3.8_serial:
-   <<: *build_serial_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -499,8 +619,11 @@ clang_3.8_serial:
       - docker
 
 clang_3.8_mpionly:
-   <<: *build_mpionly_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -508,8 +631,11 @@ clang_3.8_mpionly:
       - docker
 
 clang_3.8_hybrid:
-   <<: *build_hybrid_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   variables:
+      <<: *build_hybrid_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -517,8 +643,11 @@ clang_3.8_hybrid:
       - docker
 
 clang_3.8_serial_dbg:
-   <<: *build_serial_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -526,8 +655,11 @@ clang_3.8_serial_dbg:
       - docker
 
 clang_3.8_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -535,8 +667,11 @@ clang_3.8_mpionly_dbg:
       - docker
 
 clang_3.8_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   variables:
+      <<: *build_hybrid_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -544,8 +679,11 @@ clang_3.8_hybrid_dbg:
       - docker
 
 clang_3.8_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   variables:
+      <<: *build_hybrid_dbg_sp_variables
+      WALBERLA_BUILD_WITH_CUDA: "ON"
    only:
       - triggers
    tags:
@@ -553,216 +691,300 @@ clang_3.8_hybrid_dbg_sp:
       - docker
 
 clang_3.9_serial:
-   <<: *build_serial_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_3.9_mpionly:
-   <<: *build_mpionly_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_3.9_hybrid:
-   <<: *build_hybrid_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+   variables:
+      <<: *build_hybrid_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_3.9_serial_dbg:
-   <<: *build_serial_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_3.9_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_3.9_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+   variables:
+      <<: *build_hybrid_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_3.9_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+   variables:
+      <<: *build_hybrid_dbg_sp_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_4.0_serial:
-   <<: *build_serial_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_4.0_mpionly:
-   <<: *build_mpionly_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_4.0_hybrid:
-   <<: *build_hybrid_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+   variables:
+      <<: *build_hybrid_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_4.0_serial_dbg:
-   <<: *build_serial_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_4.0_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_4.0_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+   variables:
+      <<: *build_hybrid_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_4.0_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+   variables:
+      <<: *build_hybrid_dbg_sp_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_5.0_serial:
-   <<: *build_serial_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_5.0_mpionly:
-   <<: *build_mpionly_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_5.0_hybrid:
-   <<: *build_hybrid_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+   variables:
+      <<: *build_hybrid_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_5.0_serial_dbg:
-   <<: *build_serial_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_5.0_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_5.0_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+   variables:
+      <<: *build_hybrid_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_5.0_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+   variables:
+      <<: *build_hybrid_dbg_sp_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_6.0_serial:
-   <<: *build_serial_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_6.0_mpionly:
-   <<: *build_mpionly_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    only:
       - triggers
    tags:
       - docker
 
 clang_6.0_hybrid:
-   <<: *build_hybrid_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   variables:
+      <<: *build_hybrid_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
 
 clang_6.0_serial_dbg:
-   <<: *build_serial_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
 
 clang_6.0_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
 
 clang_6.0_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   variables:
+      <<: *build_hybrid_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
 
 clang_6.0_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
+   <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   variables:
+      <<: *build_hybrid_dbg_sp_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
    tags:
       - docker
 
-- 
GitLab