Merge pull request #5905 from sejongoh/group_jitstress_jobs

Move all JIT stress jobs into a sub directory on CI

1 files changed, 8 insertions, 9 deletions

diff --git a/netci.groovy b/netci.groovy
index 891087f555..ef8bf4f1be 100755
--- a/netci.groovy
+++ b/netci.groovy
@@ -96,11 +96,7 @@ def static setMachineAffinity(def job, def os, def architecture) {
 }
 
 def static isJITStressJob(def scenario) {
-    // For testing purpose, we test only one scenario here.
-    if (scenario == 'jitstress2_jitstressregs1') {
-        return true;
-    }    
-    return false;
+    return Constants.jitStressModeScenarios.containsKey(scenario)
 }
 
 def static isGCStressRelatedTesting(def scenario) {
@@ -1427,7 +1423,7 @@ combinedScenarios.each { scenario ->
                     
                     // Create the new job
                     def newJob = job(Utilities.getFullJobName(project, jobName, isPR, folderName)) {}
-
+                    
                     setMachineAffinity(newJob, os, architecture)
 
                     // Add all the standard options
@@ -1816,12 +1812,14 @@ combinedScenarios.each { scenario ->
                             }
                         }
                     }
+                    
                 } // os
             } // configuration
         } // architecture
     } // isPR
 } // scenario
 
+
 // Create the Linux/OSX/CentOS coreclr test leg for debug and release and each scenario
 combinedScenarios.each { scenario ->
     [true, false].each { isPR ->
@@ -1935,6 +1933,7 @@ combinedScenarios.each { scenario ->
                     def lowerConfiguration = configuration.toLowerCase()
                     def osGroup = getOSGroup(os)
                     def jobName = getJobName(configuration, architecture, os, scenario, false) + "_tst"
+                    
                     // Unless this is a coverage test run, we want to copy over the default build of coreclr.
                     def inputScenario = 'default'
                     if (scenario == 'coverage') {
@@ -2052,8 +2051,8 @@ combinedScenarios.each { scenario ->
                         }
                     }
                     
-
-                    def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
+                    def folder = isJITStressJob(scenario) ? 'jitstress' : ''
+                    def newJob = job(Utilities.getFullJobName(project, jobName, isPR, folder)) {
                         // Add parameters for the inputs
                     
                         parameters {
@@ -2199,7 +2198,7 @@ combinedScenarios.each { scenario ->
                     JobReport.Report.addReference(inputCoreCLRBuildName)
                     JobReport.Report.addReference(inputWindowTestsBuildName)
                     JobReport.Report.addReference(fullTestJobName)
-                    def newFlowJob = buildFlowJob(Utilities.getFullJobName(project, flowJobName, isPR)) {
+                    def newFlowJob = buildFlowJob(Utilities.getFullJobName(project, flowJobName, isPR, folder)) {
                         buildFlow("""
 // Build the input jobs in parallel
 parallel (