From e5c4e6cd9f5a2039cbb7c00aa496fee31154c01d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 13 Apr 2016 15:20:21 -0700 Subject: [PATCH] Add reporting functionality to the coreclr netci file Also eliminate a few jobs that aren't being referenced. Commit migrated from https://github.com/dotnet/coreclr/commit/8614810caec4b5a2a33547fe3f9dfd3982357b6e --- src/coreclr/netci.groovy | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy index 893fec2..ee3339a 100755 --- a/src/coreclr/netci.groovy +++ b/src/coreclr/netci.groovy @@ -1,6 +1,7 @@ // Import the utility functionality. import jobs.generation.Utilities; +import jobs.generation.JobReport; // The input project name (e.g. dotnet/coreclr) def project = GithubProject @@ -943,7 +944,7 @@ combinedScenarios.each { scenario -> return } // only x64 or x86 for now - if (architecture != 'x64' && architecture != 'x86') { + if (architecture != 'x64') { return } break @@ -954,7 +955,7 @@ combinedScenarios.each { scenario -> return } // only x64 or x86 for now - if (architecture != 'x64' && architecture != 'x86') { + if (architecture != 'x64') { return } break @@ -965,17 +966,17 @@ combinedScenarios.each { scenario -> return } // only x64 or x86 for now - if (architecture != 'x64' && architecture != 'x86') { + if (architecture != 'x64') { return } break case 'longgc': - if (os != 'Windows_NT' && !(os in Constants.crossList)) { + if (os != 'Windows_NT') { return } // only x64 or x86 for now - if (architecture != 'x64' && architecture != 'x86') { + if (architecture != 'x64') { return } break @@ -1495,6 +1496,10 @@ combinedScenarios.each { scenario -> // Linux CoreCLR test def flowJobName = getJobName(configuration, architecture, os, scenario, false) + "_flow" def fullTestJobName = projectFolder + '/' + newJob.name + // Add a reference to the input jobs for report purposes + JobReport.Report.addReference(inputCoreCLRBuildName) + JobReport.Report.addReference(inputWindowTestsBuildName) + JobReport.Report.addReference(fullTestJobName) def newFlowJob = buildFlowJob(Utilities.getFullJobName(project, flowJobName, isPR)) { buildFlow(""" // Build the input jobs in parallel @@ -1516,3 +1521,5 @@ build(params + [CORECLR_BUILD: coreclrBuildJob.build.number, } // architecture } // isPR } // scenario + +JobReport.Report.generateJobReport(out) \ No newline at end of file -- 2.7.4