Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 9a25658

Browse files
committed
Don't add triggers for arm/armlb/arm64 non-flow jobs
1 parent 37d85ca commit 9a25658

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

netci.groovy

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,6 +1166,11 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
11661166
}
11671167
break
11681168
case 'Windows_NT':
1169+
// Triggers on the non-flow jobs aren't necessary here
1170+
if (!isFlowJob) {
1171+
break
1172+
}
1173+
11691174
// Set up a private trigger
11701175
def contextString = "${os} ${architecture} Cross ${configuration}"
11711176
def triggerString = "(?i).*test\\W+${os}\\W+${architecture}\\W+Cross\\W+${configuration}"
@@ -1262,6 +1267,11 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
12621267
}
12631268
break
12641269
case 'Windows_NT':
1270+
// Triggers on the non-flow jobs aren't necessary here
1271+
if (!isFlowJob) {
1272+
break
1273+
}
1274+
12651275
assert isArmWindowsScenario(scenario)
12661276
switch (scenario) {
12671277
case 'default':
@@ -1828,8 +1838,6 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
18281838
return buildCommands
18291839
}
18301840

1831-
// Additional scenario which can alter behavior
1832-
18331841
Constants.allScenarios.each { scenario ->
18341842
[true, false].each { isPR ->
18351843
Constants.architectureList.each { architecture ->
@@ -2059,7 +2067,7 @@ Constants.allScenarios.each { scenario ->
20592067

20602068
// Add all the standard options
20612069
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
2062-
addTriggers(newJob, branch, isPR, architecture, os, configuration, scenario, false, isBuildOnly)
2070+
addTriggers(newJob, branch, isPR, architecture, os, configuration, scenario, false, isBuildOnly) // isFlowJob==false
20632071

20642072
def buildCommands = calculateBuildCommands(newJob, scenario, branch, isPR, architecture, configuration, os, isBuildOnly)
20652073
def osGroup = getOSGroup(os)
@@ -2741,7 +2749,7 @@ build(params + [CORECLR_BUILD: coreclrBuildJob.build.number,
27412749

27422750
setMachineAffinity(newFlowJob, os, flowArch, affinityOptions)
27432751
Utilities.standardJobSetup(newFlowJob, project, isPR, "*/${branch}")
2744-
addTriggers(newFlowJob, branch, isPR, architecture, os, configuration, scenario, true, false)
2752+
addTriggers(newFlowJob, branch, isPR, architecture, os, configuration, scenario, true, false) // isFlowJob==true, isWindowsBuildOnlyJob==false
27452753
} // configuration
27462754
} // os
27472755
} // architecture

0 commit comments

Comments
 (0)