Move Windows icc config to post-submit testing

The front end and standard library for this build are the same as the
msvc config, so there is not a great deal of coverage added by this
config. Post-submit does not use this slave at all.  Only running one
job per matrix on this slave will permit us to use only one executor
on it, which might reduce the number of strange failures and hangups.

Fixes #2387

Change-Id: Iedc421b7f4ea6d74f0b4cbd5cc88ea958b427213

diff --git a/admin/builds/post-submit-matrix.txt b/admin/builds/post-submit-matrix.txt
index 876961a0bcf590f592b25467cb30d0a28587b2b7..756077de0f5c4438585aa6336d49284dca56adc3 100644 (file)
--- a/admin/builds/post-submit-matrix.txt
+++ b/admin/builds/post-submit-matrix.txt
@@ -37,6 +37,13 @@ clang-3.4 npme=1 nranks=2 mpi no-openmp
 # Test SSE2 SIMD
 gcc-4.8 gpu npme=1 nranks=2 gpu_id=2 cuda-7.5 simd=sse2 release
 
+# Test oldest supported icc on Windows
+# Test newest supported icc on Windows
+# TODO When merging to release-2018, reconsider which build
+# options might best remain in pre-submit on the msvc config,
+# and which are OK in post-submit
+icc-16.0 msvc-2015 fftpack
+
 # TODO
 # Re-enable Phi build
 # Test without TNG support

diff --git a/admin/builds/pre-submit-matrix.txt b/admin/builds/pre-submit-matrix.txt
index 06b3aa696cbce328bfeb2ce730494292550de38a..f773307e779a9debf3f23c6becf4efe82d87f880 100644 (file)
--- a/admin/builds/pre-submit-matrix.txt
+++ b/admin/builds/pre-submit-matrix.txt
@@ -46,10 +46,6 @@ clang-3.4 double thread-mpi no-openmp fftpack asan
 # Test newest supported MSVC on Windows
 msvc-2015 openmp release
 
-# Test oldest supported icc on Windows
-# Test newest supported icc on Windows
-icc-16.0 msvc-2015 fftpack
-
 # Test newest cmake at time of release
 # Test MKL
 # Test without any MPI