From e696ef3fb34f98bbe0b370de5cbb49b77f3b7d39 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 20 Oct 2015 08:52:36 -0700 Subject: [PATCH] Fixup Commit migrated from https://github.com/dotnet/coreclr/commit/6ec712cb1864b69a73053bc9bad97cdcd414919f --- src/coreclr/netci.groovy | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy index 3f707d5..87e47bc 100644 --- a/src/coreclr/netci.groovy +++ b/src/coreclr/netci.groovy @@ -196,8 +196,10 @@ def static getBuildJobName(def configuration, def os) { def lowerConfiguration = configuration.toLowerCase() def osGroup = osGroupMap[os] def jobName = getBuildJobName(configuration, os) + "_tst" - def inputCoreCLRBuildName = Utilities.getFolderName(project) + '/' + getBuildJobName(configuration, os) - def inputWindowTestsBuildName = Utilities.getFolderName(project) + '/' + getBuildJobName(configuration, 'windows_nt') + def inputCoreCLRBuildName = Utilities.getFolderName(project) + '/' + + Utilities.getFullJobName(project, getBuildJobName(configuration, os), isPR) + def inputWindowTestsBuildName = Utilities.getFolderName(project) + '/' + + Utilities.getFullJobName(project, getBuildJobName(configuration, 'windows_nt'), isPR) def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) { // Set the label. @@ -281,16 +283,18 @@ def static getBuildJobName(def configuration, def os) { def fullTestJobName = Utilities.getFolderName(project) + '/' + newJob.name def newFlowJob = buildFlowJob(Utilities.getFullJobName(project, flowJobName, isPR)) { buildFlow(""" +// Grab the checked out git commit hash so that it can be passed to the child +// builds. +gitCommit = build.environment.get('GIT_COMMIT') // Build the input jobs in parallel parallel ( - { linuxBuildJob = build(params, '${inputCoreCLRBuildName}') }, - { windowsBuildJob = build(params, '${inputWindowTestsBuildName}') } + { linuxBuildJob = build(params + [GitBranchOrCommit: gitCommit], '${inputCoreCLRBuildName}') }, + { windowsBuildJob = build(params + [GitBranchOrCommit: gitCommit], '${inputWindowTestsBuildName}') } ) // And then build the test build build(params + [CORECLR_LINUX_BUILD: linuxBuildJob.build.number, - CORECLR_WINDOWS_BUILD: windowsBuildJob.build.number], - '${fullTestJobName}') + CORECLR_WINDOWS_BUILD: windowsBuildJob.build.number, GitBranchOrCommit: gitCommit], '${fullTestJobName}') """) // Needs a workspace -- 2.7.4