Merge pull request #5892 from sejongoh/group_jitstress_jobs

Initial changes to move JIT stress jobs into jitstress directory on CI

1 files changed, 13 insertions, 1 deletions

diff --git a/netci.groovy b/netci.groovy
index bef7bd54ce..9dedb1e720 100755
--- a/netci.groovy
+++ b/netci.groovy
@@ -8,6 +8,9 @@ def project = GithubProject
 // The input branch name (e.g. master)
 def branch = GithubBranchName
 def projectFolder = Utilities.getFolderName(project) + '/' + Utilities.getFolderName(branch)
+
+// Create a folder for JIT stress jobs
+folder('jitstress')
                        
 def static getOSGroup(def os) {
     def osGroupMap = ['Ubuntu':'Linux',
@@ -92,6 +95,14 @@ 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;
+}
+
 def static isGCStressRelatedTesting(def scenario) {
     // The 'gcstress15_pri1r2r' scenario is a basic scenario.
     // Detect it and make it a GCStress related.
@@ -1405,9 +1416,10 @@ combinedScenarios.each { scenario ->
                     // Calculate names
                     def lowerConfiguration = configuration.toLowerCase()
                     def jobName = getJobName(configuration, architecture, os, scenario, isBuildOnly)
+                    def folderName = isJITStressJob(scenario) ? 'jitstress' : '';
                     
                     // Create the new job
-                    def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {}
+                    def newJob = job(Utilities.getFullJobName(project, jobName, isPR, folderName)) {}
 
                     setMachineAffinity(newJob, os, architecture)