Simplify ci to 3 parts now that we don't build many fsharp.core.dlls (#3195)

* Simplify ci to 3 parts now that we don't build many fsharp.core.dlls

* ci_part1 was still to broad

build.cmd

@@ -19,7 +19,7 @@ echo Usage:
 echo.
 echo build.cmd ^<all^|net40^|coreclr^|vs^>
 echo           ^<proto^|protofx^>
-echo           ^<ci^|ci_part1^|ci_part2^|ci_part3^|ci_part4^|microbuild^|nuget^>
+echo           ^<ci^|ci_part1^|ci_part2^|ci_part3^|microbuild^|nuget^>
 echo           ^<debug^|release^>
 echo           ^<diag^|publicsign^>
 echo           ^<test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-net40-ideunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^>
@@ -207,19 +207,15 @@ if /i "%ARG%" == "nuget" (
     set BUILD_NUGET=1
 )
 
-REM These divide "ci" into two chunks which can be done in parallel
+REM These divide "ci" into three chunks which can be done in parallel
 if /i "%ARG%" == "ci_part1" (
     set _autoselect=0
 
     REM what we do
     set BUILD_PROTO=1
     set BUILD_NET40=1
-    set BUILD_PROTO_WITH_CORECLR_LKG=1
     set BUILD_NET40_FSHARP_CORE=1
     set BUILD_VS=1
-    set BUILD_CORECLR=1
-    set BUILD_SETUP=%FSC_BUILD_SETUP%
-    set BUILD_NUGET=1
     set TEST_VS_IDEUNIT_SUITE=1
     set CI=1
 )
@@ -231,7 +227,9 @@ if /i "%ARG%" == "ci_part2" (
     set BUILD_PROTO=1
     set BUILD_NET40=1
     set BUILD_NET40_FSHARP_CORE=1
+    set TEST_NET40_COMPILERUNIT_SUITE=1
     set TEST_NET40_COREUNIT_SUITE=1
+    set TEST_NET40_FSHARPQA_SUITE=1
     set TEST_NET40_FSHARP_SUITE=1
     set CI=1
 )
@@ -245,24 +243,14 @@ if /i "%ARG%" == "ci_part3" (
     set BUILD_CORECLR=1
     set BUILD_NET40_FSHARP_CORE=1
     set BUILD_NUGET=1
+    set BUILD_NET40=1
+    set BUILD_VS=1
+    set BUILD_SETUP=%FSC_BUILD_SETUP%
     set TEST_CORECLR_FSHARP_SUITE=1
     set TEST_CORECLR_COREUNIT_SUITE=1
     set CI=1
 )
 
-if /i "%ARG%" == "ci_part4" (
-    set _autoselect=0
-
-    REM what we do
-    set BUILD_PROTO=1
-    set BUILD_NET40=1
-    set BUILD_NET40_FSHARP_CORE=1
-
-    set TEST_NET40_COMPILERUNIT_SUITE=1
-    set TEST_NET40_FSHARPQA_SUITE=1
-    set CI=1
-)
-
 if /i "%ARG%" == "proto" (
     set _autoselect=0
     set BUILD_PROTO=1

netci.groovy

@@ -12,7 +12,7 @@ def static getBuildJobName(def configuration, def os) {
 
 [true, false].each { isPullRequest ->
     osList.each { os ->
-        def configurations = ['Debug', 'Release_ci_part1', 'Release_ci_part2', 'Release_ci_part3', 'Release_ci_part4', 'Release_net40_no_vs' ];
+        def configurations = ['Debug', 'Release_ci_part1', 'Release_ci_part2', 'Release_ci_part3', 'Release_net40_no_vs' ];
         if (os != 'Windows_NT') {
             // Only build one configuration on Linux/... so far
             configurations = ['Release'];
@@ -42,9 +42,6 @@ def static getBuildJobName(def configuration, def os) {
                 else if (configuration == "Release_ci_part3") {
                     build_args = "ci_part3"
                 }
-                else if (configuration == "Release_ci_part4") {
-                    build_args = "ci_part4"
-                }
                 else if (configuration == "Release_net40_no_vs") {
                     build_args = "net40"
                 }