@@ -1110,8 +1110,11 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def
1110
1110
}
1111
1111
else {
1112
1112
// Currently no push triggers, with limited arm Linux hardware.
1113
+ // TODO: If we have enough machine capacity, add some arm Linux push triggers.
1113
1114
assert os == ' Ubuntu'
1114
- addPeriodicTriggerHelper(job, ' @daily' )
1115
+ if (isFlowJob) {
1116
+ addPeriodicTriggerHelper(job, ' @daily' )
1117
+ }
1115
1118
}
1116
1119
break
1117
1120
case ' armem' :
@@ -1289,22 +1292,34 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def
1289
1292
case ' corefx_jitstressregs0x80' :
1290
1293
case ' corefx_jitstressregs0x1000' :
1291
1294
case ' zapdisable' :
1292
- if (os != ' CentOS7.1' && ! (os in bidailyCrossList)) {
1293
- assert (os == ' Windows_NT' ) || (os in Constants . crossList)
1294
- if (jobRequiresLimitedHardware(architecture, os)) {
1295
- addPeriodicTriggerHelper(job, ' @weekly' )
1296
- }
1297
- else {
1298
- addPeriodicTriggerHelper(job, ' @daily' )
1299
- }
1295
+ if (os == ' CentOS7.1' ) {
1296
+ break
1297
+ }
1298
+ if (os in bidailyCrossList) {
1299
+ break
1300
+ }
1301
+ assert (os == ' Windows_NT' ) || (os in Constants . crossList)
1302
+ if (jobRequiresLimitedHardware(architecture, os)) {
1303
+ addPeriodicTriggerHelper(job, ' @weekly' )
1304
+ }
1305
+ else {
1306
+ addPeriodicTriggerHelper(job, ' @daily' )
1300
1307
}
1301
1308
break
1302
1309
case ' heapverify1' :
1303
1310
case ' gcstress0x3' :
1304
- if (os != ' CentOS7.1' && ! (os in bidailyCrossList)) {
1305
- assert (os == ' Windows_NT' ) || (os in Constants . crossList)
1306
- addPeriodicTriggerHelper(job, ' @weekly' )
1311
+ if (os == ' CentOS7.1' ) {
1312
+ break
1313
+ }
1314
+ if (os in bidailyCrossList) {
1315
+ break
1307
1316
}
1317
+ if ((architecture == ' arm64' ) && (os != ' Windows_NT' )) {
1318
+ // TODO: should we have cron jobs for arm64 Linux GCStress?
1319
+ break
1320
+ }
1321
+ assert (os == ' Windows_NT' ) || (os in Constants . crossList)
1322
+ addPeriodicTriggerHelper(job, ' @weekly' )
1308
1323
break
1309
1324
case ' gcstress0xc' :
1310
1325
case ' gcstress0xc_zapdisable' :
@@ -1313,11 +1328,22 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def
1313
1328
case ' gcstress0xc_jitstress1' :
1314
1329
case ' gcstress0xc_jitstress2' :
1315
1330
case ' gcstress0xc_minopts_heapverify1' :
1316
- // GCStress=C is currently not supported on OS X
1317
- if (os != ' CentOS7.1' && os != ' OSX10.12' && ! (os in bidailyCrossList)) {
1318
- assert (os == ' Windows_NT' ) || (os in Constants . crossList)
1319
- addPeriodicTriggerHelper(job, ' @weekly' )
1331
+ if (os == ' CentOS7.1' ) {
1332
+ break
1333
+ }
1334
+ if (os == ' OSX10.12' ) {
1335
+ // GCStress=C is currently not supported on OS X
1336
+ break
1337
+ }
1338
+ if (os in bidailyCrossList) {
1339
+ break
1340
+ }
1341
+ if ((architecture == ' arm64' ) && (os != ' Windows_NT' )) {
1342
+ // TODO: should we have cron jobs for arm64 Linux GCStress?
1343
+ break
1320
1344
}
1345
+ assert (os == ' Windows_NT' ) || (os in Constants . crossList)
1346
+ addPeriodicTriggerHelper(job, ' @weekly' )
1321
1347
break
1322
1348
1323
1349
case ' illink' :
@@ -3221,11 +3247,6 @@ def static CreateTestJob(def dslFactory, def project, def branch, def architectu
3221
3247
// Returns the new flow job.
3222
3248
def static CreateFlowJob (def dslFactory , def project , def branch , def architecture , def os , def configuration , def scenario , def isPR , def fullTestJobName , def inputCoreCLRBuildName , def inputTestsBuildName )
3223
3249
{
3224
- if (os == ' RHEL7.2' || os == ' Debian8.4' ) {
3225
- // Do not create the flow job for RHEL jobs.
3226
- return
3227
- }
3228
-
3229
3250
// Windows CoreCLR build and Linux CoreCLR build (in parallel) ->
3230
3251
// Linux CoreCLR test
3231
3252
def flowJobName = getJobName(configuration, architecture, os, scenario, false ) + " _flow"
@@ -3522,6 +3543,11 @@ Constants.allScenarios.each { scenario ->
3522
3543
// Create a build flow to join together the build and tests required to run this test.
3523
3544
// =============================================================================================
3524
3545
3546
+ if (os == ' RHEL7.2' || os == ' Debian8.4' ) {
3547
+ // Do not create the flow job for RHEL jobs.
3548
+ return
3549
+ }
3550
+
3525
3551
def fullTestJobName = projectFolder + ' /' + testJob. name
3526
3552
def flowJob = CreateFlowJob (this , project, branch, architecture, os, configuration, scenario, isPR, fullTestJobName, inputCoreCLRBuildName, inputTestsBuildName)
3527
3553
0 commit comments