Gitlab CI: More recent compilers on KNL

.ci-env-vars

 if [ "$(hostname)" == "buildtest-rzg" ]; then module load impi/5.1.3 intel/16.0 gcc/6.3 mkl/11.3 autotools pkg-config; fi
 
-if [ "$(hostname)" == "knl1" -o "$(hostname)" == "knl2" -o "$(hostname)" == "knl3" -o "$(hostname)" == "knl4" ] ; then module load impi/5.1.3 intel/16.0 gcc/7.2 mkl/11.3 pkg-config; fi
-if [ "$(hostname)" == "maik" ]; then module load impi/5.1.3 intel intel/17.0 gcc/7.2 mkl/2017 pkg-config/0.29.1; fi
+if [ "$(hostname)" == "knl1" -o "$(hostname)" == "knl2" -o "$(hostname)" == "knl3" -o "$(hostname)" == "knl4" ] ; then module load impi/2017.4 intel/17.0 gcc/7.2 mkl/2017 pkg-config; fi
+if [ "$(hostname)" == "maik" ]; then module load impi/5.1.3 intel intel/17.0 gcc/6.3 mkl/2017 pkg-config/0.29.1; fi
 
 if [ "$(hostname)" == "gp02" ] ; then module load impi/5.1.3 intel/17.0 gcc/6.3 mkl/2017 pkg-config; fi
 

generate_gitlab_ci_tests.py

@@ -14,13 +14,13 @@ def set_number_of_cores(mpi_tasks, o):
 def set_requested_memory(na):
     memory="None"
     if (na == "150"):
-            memory="1Gb"
+            memory="2Gb"
     elif (na > "150" and na <= "1500"):
-        memory="4Gb"
+        memory="6Gb"
     elif (na > "1500" and na < "5000"):
-        memory="8Gb"
+        memory="12Gb"
     else:
-        memory="10Gb"
+        memory="16Gb"
     return memory
 
 def set_compiler_wrappers(mpi, fc, cc, instr, fortran_compiler, c_compiler):