From 4bdf2cfe010810244d7d2c28d8dc719a7e8a51b9 Mon Sep 17 00:00:00 2001 From: Bruce Forstall Date: Fri, 29 Jun 2018 12:28:29 -0700 Subject: [PATCH] Remove build-only and TST jobs from the Jenkins views We only want non-PR, "top-level" jobs in the views. Build-only and TST jobs are always "child" jobs of other flow jobs, which will be in the views. Commit migrated from https://github.com/dotnet/coreclr/commit/7b35c6e0663ca122a9359a8f01f0b6bf74a6185e --- src/coreclr/netci.groovy | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy index 0d8e351..9d5c929 100755 --- a/src/coreclr/netci.groovy +++ b/src/coreclr/netci.groovy @@ -2864,8 +2864,12 @@ Constants.allScenarios.each { scenario -> // Create the new job def newJob = job(Utilities.getFullJobName(project, jobName, isPR, folderName)) {} - // Should we add corefx_innerloop to views? - addToViews(newJob, isPR, architecture, os) + // We don't want to include in view any job that is only used by a flow job (because we want the views to have only the + // "top-level" jobs. Build only jobs are such jobs. + if (!isBuildOnly) + { + addToViews(newJob, isPR, architecture, os) + } setJobMachineAffinity(architecture, os, true, false, false, newJob) // isBuildJob = true, isTestJob = false, isFlowJob = false @@ -3404,6 +3408,8 @@ ${runScript} \\ // Create a test job that will be used by a flow job. // Returns the newly created job. +// Note that we don't add tests jobs to the various views, since they are always used by a flow job, which is in the views, +// and we want the views to be the minimal set of "top-level" jobs that represent all work. def static CreateTestJob(def dslFactory, def project, def branch, def architecture, def os, def configuration, def scenario, def isPR, def inputCoreCLRBuildName, def inputTestsBuildName) { def windowsArmJob = ((os == "Windows_NT") && (architecture in Constants.armWindowsCrossArchitectureList)) @@ -3418,8 +3424,6 @@ def static CreateTestJob(def dslFactory, def project, def branch, def architectu setJobMachineAffinity(architecture, os, false, true, false, newJob) // isBuildJob = false, isTestJob = true, isFlowJob = false - addToViews(newJob, isPR, architecture, os) - if (scenario == 'jitdiff') { def osGroup = getOSGroup(os) Utilities.addArchival(newJob, "bin/tests/${osGroup}.${architecture}.${configuration}/dasm/**") -- 2.7.4