summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Godbe <william.godbe@comcast.net>2015-12-31 13:48:49 -0800
committerWilliam Godbe <william.godbe@comcast.net>2015-12-31 13:50:34 -0800
commitc4592a40e324a3040f76251ae19a83ee8d3c9f48 (patch)
treeb946e894b40b1a4df38d309a29ddcb118a2d5cc2
parentb80f60f3435438b964b0b5fb0c0753610fed6123 (diff)
downloadcoreclr-c4592a40e324a3040f76251ae19a83ee8d3c9f48.tar.gz
coreclr-c4592a40e324a3040f76251ae19a83ee8d3c9f48.tar.bz2
coreclr-c4592a40e324a3040f76251ae19a83ee8d3c9f48.zip
message
-rw-r--r--netci.groovy15
1 files changed, 6 insertions, 9 deletions
diff --git a/netci.groovy b/netci.groovy
index 8d03f085f4..65aab2f893 100644
--- a/netci.groovy
+++ b/netci.groovy
@@ -331,18 +331,15 @@ def static addPRTrigger(def job, def architecture, def os, def configuration, is
def jobName = getBuildJobName(configuration, architecture, os) + "_tst"
def inputCoreCLRBuildName = Utilities.getFolderName(project) + '/' +
Utilities.getFullJobName(project, getBuildJobName(configuration, architecture, os), isPR)
+ def name_suffix = ""
if (buildPri1Tests)
{
- def inputWindowTestsBuildName = Utilities.getFolderName(project) + '/' +
- Utilities.getFullJobName(project, getBuildJobName(configuration, architecture, 'windows_nt') + "_pri1", isPR)
- }
- else
- {
- def inputWindowTestsBuildName = Utilities.getFolderName(project) + '/' +
- Utilities.getFullJobName(project, getBuildJobName(configuration, architecture, 'windows_nt'), isPR)
+ name_suffix = "_pri1";
}
+ def inputWindowTestsBuildName = Utilities.getFolderName(project) + '/' +
+ Utilities.getFullJobName(project, getBuildJobName(configuration, architecture, 'windows_nt') + name_suffix, isPR)
- def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
+ def newJob = job(Utilities.getFullJobName(project, jobName, isPR) + name_suffix) {
// Add parameters for the inputs
parameters {
@@ -416,7 +413,7 @@ def static addPRTrigger(def job, def architecture, def os, def configuration, is
// Linux CoreCLR test
def flowJobName = getBuildJobName(configuration, architecture, os) + "_flow"
def fullTestJobName = Utilities.getFolderName(project) + '/' + newJob.name
- def newFlowJob = buildFlowJob(Utilities.getFullJobName(project, flowJobName, isPR)) {
+ def newFlowJob = buildFlowJob(Utilities.getFullJobName(project, flowJobName, isPR) + name_suffix) {
buildFlow("""
// Build the input jobs in parallel
parallel (