[1.2>1.3] [MERGE #2887 @MSLaguana] Updating CI script

Merge pull request #2887 from MSLaguana:fixCIPRTriggers

Prior to this change, we were building some configurations for all branches when a PR came in.
This is just backporting the netci.groovy script from `release/1.4` to be more consistent.

Fixes #2877

netci.groovy

@@ -27,96 +27,146 @@ def machineTypeToOSTagMap = [
 
 def dailyRegex = 'dailies'
 
-// Only generate PR check triggers for the version of netci.groovy in the master branch
-// since those PR checks will apply for all branches.
-def jobTypesToGenerate = [false]
-if (branch.startsWith('master')) {
-    // OK to generate PR checks (this ensures we only generate one set of them)
-    jobTypesToGenerate += true
-}
-
 // ---------------
 // HELPER CLOSURES
 // ---------------
 
+def CreateBuildTask = { isPR, buildArch, buildType, machine, configTag, buildExtra, testExtra, runCodeAnalysis, excludeConfigIf, nonDefaultTaskSetup ->
+    if (excludeConfigIf && excludeConfigIf(isPR, buildArch, buildType)) {
+        return // early exit: we don't want to create a job for this configuration
+    }
+
+    def config = "${buildArch}_${buildType}"
+    config = (configTag == null) ? config : "${configTag}_${config}"
+
+    // params: Project, BaseTaskName, IsPullRequest (appends '_prtest')
+    def jobName = Utilities.getFullJobName(project, config, isPR)
+
+    def testableConfig = buildType in ['debug', 'test'] && buildArch != 'arm'
+    def analysisConfig = buildType in ['release'] && runCodeAnalysis
+
+    def buildScript = "call .\\jenkins\\buildone.cmd ${buildArch} ${buildType} "
+    buildScript += buildExtra ?: ''
+    buildScript += analysisConfig ? ' "/p:runcodeanalysis=true"' : ''
+    def testScript = "call .\\jenkins\\testone.cmd ${buildArch} ${buildType} "
+    testScript += testExtra ?: ''
+    def analysisScript = '.\\Build\\scripts\\check_prefast_error.ps1 . CodeAnalysis.err'
+
+    def newJob = job(jobName) {
+        // This opens the set of build steps that will be run.
+        // This looks strange, but it is actually a method call, with a
+        // closure as a param, since Groovy allows method calls without parens.
+        // (Compare with '.each' method used above.)
+        steps {
+            batchFile(buildScript) // run the parameter as if it were a batch file
+            if (testableConfig) {
+                batchFile(testScript)
+            }
+            if (analysisConfig) {
+                powerShell(analysisScript)
+            }
+        }
+    }
+
+    def msbuildType = msbuildTypeMap.get(buildType)
+    def msbuildFlavor = "build_${buildArch}${msbuildType}"
+    def archivalString = "test/${msbuildFlavor}.*,test/logs/**"
+    archivalString += analysisConfig ? ',CodeAnalysis.err' : ''
+    Utilities.addArchival(newJob, archivalString,
+        '', // no exclusions from archival
+        false, // doNotFailIfNothingArchived=false ~= failIfNothingArchived
+        false) // archiveOnlyIfSuccessful=false ~= archiveAlways
+
+    Utilities.setMachineAffinity(newJob, machine, 'latest-or-auto')
+    Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
+
+    if (nonDefaultTaskSetup == null) {
+        if (isPR) {
+            def osTag = machineTypeToOSTagMap.get(machine)
+            Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osTag} ${config}")
+        } else {
+            Utilities.addGithubPushTrigger(newJob)
+        }
+    } else {
+        // nonDefaultTaskSetup is e.g. DailyBuildTaskSetup (which sets up daily builds)
+        // These jobs will only be configured for the branch specified below,
+        // which is the name of the branch netci.groovy was processed for.
+        // See list of such branches at:
+        // https://github.com/dotnet/dotnet-ci/blob/master/jobs/data/repolist.txt
+        nonDefaultTaskSetup(newJob, isPR, config)
+    }
+}
+
 def CreateBuildTasks = { machine, configTag, buildExtra, testExtra, runCodeAnalysis, excludeConfigIf, nonDefaultTaskSetup ->
-    jobTypesToGenerate.each { isPR ->
+    [true, false].each { isPR ->
         ['x86', 'x64', 'arm'].each { buildArch ->
             ['debug', 'test', 'release'].each { buildType ->
-                if (excludeConfigIf && excludeConfigIf(isPR, buildArch, buildType)) {
-                    return // early exit: we don't want to create a job for this configuration
-                }
-
-                def config = "${buildArch}_${buildType}"
-                config = (configTag == null) ? config : "${configTag}_${config}"
-
-                // params: Project, BaseTaskName, IsPullRequest (appends '_prtest')
-                def jobName = Utilities.getFullJobName(project, config, isPR)
-
-                def testableConfig = buildType in ['debug', 'test'] && buildArch != 'arm'
-                def analysisConfig = buildType in ['release'] && runCodeAnalysis
-
-                def buildScript = "call .\\jenkins\\buildone.cmd ${buildArch} ${buildType} "
-                buildScript += buildExtra ?: ''
-                buildScript += analysisConfig ? ' "/p:runcodeanalysis=true"' : ''
-                def testScript = "call .\\jenkins\\testone.cmd ${buildArch} ${buildType} "
-                testScript += testExtra ?: ''
-                def analysisScript = '.\\Build\\scripts\\check_prefast_error.ps1 . CodeAnalysis.err'
-
-                def newJob = job(jobName) {
-                    // This opens the set of build steps that will be run.
-                    // This looks strange, but it is actually a method call, with a
-                    // closure as a param, since Groovy allows method calls without parens.
-                    // (Compare with '.each' method used above.)
-                    steps {
-                        batchFile(buildScript) // run the parameter as if it were a batch file
-                        if (testableConfig) {
-                            batchFile(testScript)
-                        }
-                        if (analysisConfig) {
-                            powerShell(analysisScript)
-                        }
-                    }
-                }
-
-                def msbuildType = msbuildTypeMap.get(buildType)
-                def msbuildFlavor = "build_${buildArch}${msbuildType}"
-                def archivalString = "test/${msbuildFlavor}.*,test/logs/**"
-                archivalString += analysisConfig ? ',CodeAnalysis.err' : ''
-                Utilities.addArchival(newJob, archivalString,
-                    '', // no exclusions from archival
-                    false, // doNotFailIfNothingArchived=false ~= failIfNothingArchived
-                    false) // archiveOnlyIfSuccessful=false ~= archiveAlways
-
-                Utilities.setMachineAffinity(newJob, machine, 'latest-or-auto')
-                Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
-
-                if (nonDefaultTaskSetup == null) {
-                    if (isPR) {
-                        def osTag = machineTypeToOSTagMap.get(machine)
-                        // Set up checks which apply to PRs targeting any branch
-                        Utilities.addGithubPRTrigger(newJob, "${osTag} ${config}")
-                        // To enable PR checks only for specific target branches, use the following instead:
-                        // Utilities.addGithubPRTriggerForBranch(newJob, branch, checkName)
-                    } else {
-                        Utilities.addGithubPushTrigger(newJob)
-                    }
-                } else {
-                    // nonDefaultTaskSetup is e.g. DailyBuildTaskSetup (which sets up daily builds)
-                    // These jobs will only be configured for the branch specified below,
-                    // which is the name of the branch netci.groovy was processed for.
-                    // See list of such branches at:
-                    // https://github.com/dotnet/dotnet-ci/blob/master/jobs/data/repolist.txt
-                    nonDefaultTaskSetup(newJob, isPR, config)
-                }
+                CreateBuildTask(isPR, buildArch, buildType, machine, configTag, buildExtra, testExtra, runCodeAnalysis, excludeConfigIf, nonDefaultTaskSetup)
             }
         }
     }
 }
 
+def CreateXPlatBuildTask = { isPR, buildType, staticBuild, machine, platform, configTag,
+    xplatBranch, nonDefaultTaskSetup, customOption, testVariant ->
+
+    def config = (platform == "osx" ? "osx_${buildType}" : "linux_${buildType}")
+    def numConcurrentCommand = (platform == "osx" ? "sysctl -n hw.logicalcpu" : "nproc")
+
+    config = (configTag == null) ? config : "${configTag}_${config}"
+    config = staticBuild ? "${config}_static" : config
+
+    // params: Project, BaseTaskName, IsPullRequest (appends '_prtest')
+    def jobName = Utilities.getFullJobName(project, config, isPR) + customOption.replaceAll(/[-]+/, "_")
+
+    def infoScript = "bash jenkins/get_system_info.sh --${platform}"
+    def buildFlag = buildType == "release" ? "" : (buildType == "debug" ? "--debug" : "--test-build")
+    def staticFlag = staticBuild ? "--static" : ""
+    def icuFlag = (platform == "osx" ? "--icu=/usr/local/opt/icu4c/include" : "")
+    def compilerPaths = (platform == "osx") ? "" : "--cxx=/usr/bin/clang++-3.8 --cc=/usr/bin/clang-3.8"
+    def buildScript = "bash ./build.sh ${staticFlag} -j=`${numConcurrentCommand}` ${buildFlag} ${compilerPaths} ${icuFlag} ${customOption}"
+    def testScript = "bash test/runtests.sh \"${testVariant}\""
+
+    def newJob = job(jobName) {
+        steps {
+            shell(infoScript)
+            shell(buildScript)
+            shell(testScript)
+        }
+    }
+
+    def archivalString = "BuildLinux/build.log"
+    Utilities.addArchival(newJob, archivalString,
+        '', // no exclusions from archival
+        true, // doNotFailIfNothingArchived=false ~= failIfNothingArchived (true ~= doNotFail)
+        false) // archiveOnlyIfSuccessful=false ~= archiveAlways
+
+    Utilities.setMachineAffinity(newJob, machine, 'latest-or-auto')
+    Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
+
+    if (nonDefaultTaskSetup == null) {
+        if (isPR) {
+            def osTag = machineTypeToOSTagMap.get(machine)
+            Utilities.addGithubPRTriggerForBranch(newJob, xplatBranch, "${osTag} ${config}")
+        } else {
+            Utilities.addGithubPushTrigger(newJob)
+        }
+    } else {
+        // nonDefaultTaskSetup is e.g. DailyBuildTaskSetup (which sets up daily builds)
+        // These jobs will only be configured for the branch specified below,
+        // which is the name of the branch netci.groovy was processed for.
+        // See list of such branches at:
+        // https://github.com/dotnet/dotnet-ci/blob/master/jobs/data/repolist.txt
+        nonDefaultTaskSetup(newJob, isPR, config)
+    }
+}
+
 // Generic task to trigger clang-based cross-plat build tasks
 def CreateXPlatBuildTasks = { machine, platform, configTag, xplatBranch, nonDefaultTaskSetup ->
     [true, false].each { isPR ->
+        CreateXPlatBuildTask(isPR, "test", "", machine, platform,
+            configTag, xplatBranch, nonDefaultTaskSetup, "--no-jit", "--variants disable_jit")
+
         ['debug', 'test', 'release'].each { buildType ->
             def staticBuildConfigs = [true, false]
             if (platform == "osx") {
@@ -124,56 +174,8 @@ def CreateXPlatBuildTasks = { machine, platform, configTag, xplatBranch, nonDefa
             }
 
             staticBuildConfigs.each { staticBuild ->
-                def config = (platform == "osx" ? "osx_${buildType}" : "linux_${buildType}")
-                def numConcurrentCommand = (platform == "osx" ? "sysctl -n hw.logicalcpu" : "nproc")
-
-                config = (configTag == null) ? config : "${configTag}_${config}"
-                config = staticBuild ? "${config}_static" : config
-
-                // params: Project, BaseTaskName, IsPullRequest (appends '_prtest')
-                def jobName = Utilities.getFullJobName(project, config, isPR)
-
-                def infoScript = "bash jenkins/get_system_info.sh --${platform}"
-                def buildFlag = buildType == "release" ? "" : (buildType == "debug" ? "--debug" : "--test-build")
-                def staticFlag = staticBuild ? "--static" : ""
-                def icuFlag = (platform == "osx" ? "--icu=/usr/local/opt/icu4c/include" : "")
-                def compilerPaths = (platform == "osx") ? "" : "--cxx=/usr/bin/clang++-3.8 --cc=/usr/bin/clang-3.8"
-                def buildScript = "bash ./build.sh ${staticFlag} -j=`${numConcurrentCommand}` ${buildFlag} ${compilerPaths} ${icuFlag}"
-                def testScript = "bash test/runtests.sh"
-
-                def newJob = job(jobName) {
-                    steps {
-                        shell(infoScript)
-                        shell(buildScript)
-                        shell(testScript)
-                    }
-                }
-
-                def archivalString = "BuildLinux/build.log"
-                Utilities.addArchival(newJob, archivalString,
-                    '', // no exclusions from archival
-                    true, // doNotFailIfNothingArchived=false ~= failIfNothingArchived (true ~= doNotFail)
-                    false) // archiveOnlyIfSuccessful=false ~= archiveAlways
-
-                Utilities.setMachineAffinity(newJob, machine, 'latest-or-auto')
-                Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
-
-                if (nonDefaultTaskSetup == null) {
-                    if (isPR) {
-                        def osTag = machineTypeToOSTagMap.get(machine)
-                        // Set up checks which apply to PRs targeting any branch
-                        Utilities.addGithubPRTriggerForBranch(newJob, xplatBranch, "${osTag} ${config}")
-                    } else {
-                        Utilities.addGithubPushTrigger(newJob)
-                    }
-                } else {
-                    // nonDefaultTaskSetup is e.g. DailyBuildTaskSetup (which sets up daily builds)
-                    // These jobs will only be configured for the branch specified below,
-                    // which is the name of the branch netci.groovy was processed for.
-                    // See list of such branches at:
-                    // https://github.com/dotnet/dotnet-ci/blob/master/jobs/data/repolist.txt
-                    nonDefaultTaskSetup(newJob, isPR, config)
-                }
+                CreateXPlatBuildTask(isPR, buildType, staticBuild, machine, platform,
+                    configTag, xplatBranch, nonDefaultTaskSetup, "", "")
             }
         }
     }
@@ -183,7 +185,7 @@ def DailyBuildTaskSetup = { newJob, isPR, triggerName, groupRegex ->
     // The addition of triggers makes the job non-default in GitHub.
     if (isPR) {
         def triggerRegex = "(${dailyRegex}|${groupRegex}|${triggerName})"
-        Utilities.addGithubPRTrigger(newJob,
+        Utilities.addGithubPRTriggerForBranch(newJob, branch,
             triggerName, // GitHub task name
             "(?i).*test\\W+${triggerRegex}.*")
     } else {
@@ -204,7 +206,7 @@ def CreateStyleCheckTasks = { taskString, taskName, checkName ->
         Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
         if (isPR) {
             // Set PR trigger.
-            Utilities.addGithubPRTrigger(newJob, checkName)
+            Utilities.addGithubPRTriggerForBranch(newJob, branch, checkName)
         } else {
             // Set a push trigger
             Utilities.addGithubPushTrigger(newJob)
@@ -220,6 +222,17 @@ def CreateStyleCheckTasks = { taskString, taskName, checkName ->
 
 CreateBuildTasks('Windows_NT', null, null, null, true, null, null)
 
+// Add some additional daily configs to trigger per-PR as a quality gate:
+// x64_debug Slow Tests
+CreateBuildTask(true, 'x64', 'debug',
+    'Windows_NT', 'ci_slow', null, '-includeSlow', false, null, null)
+// x64_debug DisableJIT
+CreateBuildTask(true, 'x64', 'debug',
+    'Windows_NT', 'ci_disablejit', '"/p:BuildJIT=false"', '-disablejit', false, null, null)
+// x64_debug Legacy
+CreateBuildTask(true, 'x64', 'debug',
+    'Windows 7', 'ci_dev12', 'msbuild12', '-win7 -includeSlow', false, null, null)
+
 // -----------------
 // DAILY BUILD TASKS
 // -----------------
@@ -267,11 +280,11 @@ def isXPlatCompatibleBranch = !(branch in ['release/1.1', 'release/1.1-ci', 'rel
 
 // Include these explicitly-named branches
 def isXPlatDailyBranch = branch in ['master', 'linux', 'xplat']
-// Include some release/* branches
-if (branch.startsWith('release')) {
+// Include some release/* branches (ignore branches ending in '-ci')
+if (branch.startsWith('release') && !branch.endsWith('-ci')) {
     // Allows all current and future release/* branches on which we should run daily builds of XPlat configs.
-    // RegEx matches e.g. release/1.1, release/1.2, release/1.3-ci, but not e.g. release/2.0, release/1.3, or release/1.10
-    includeReleaseBranch = !(branch =~ /^release\/((1\.[12](\D.*)?)|(\d+\.\d+\D.*))$/)
+    // RegEx matches branch names we should ignore (e.g. release/1.1, release/1.2, release/1.2-pre)
+    includeReleaseBranch = !(branch =~ /^release\/(1\.[12](\D.*)?)$/)
     isXPlatDailyBranch |= includeReleaseBranch
 }