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

Commit f339d85

Browse files
authored
Merge pull request #6054 from kyulee1/gcjob
ARM64: Enable a gcstress private job
2 parents ce479d6 + 07e9b4d commit f339d85

File tree

1 file changed

+23
-9
lines changed

1 file changed

+23
-9
lines changed

netci.groovy

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,15 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
506506
// GCStress=C is currently not supported on OS X
507507
if (os != 'CentOS7.1' && os != 'OSX' && !(os in bidailyCrossList)) {
508508
assert (os == 'Windows_NT') || (os in Constants.crossList)
509-
Utilities.addPeriodicTrigger(job, '@weekly')
509+
if (architecture == 'arm64') {
510+
assert (os == 'Windows_NT')
511+
// TODO: Enable a periodic trigger after tests are updated.
512+
// Utilities.addPeriodicTrigger(job, '@daily')
513+
// addEmailPublisher(job, '[email protected]')
514+
}
515+
else {
516+
Utilities.addPeriodicTrigger(job, '@weekly')
517+
}
510518
}
511519
break
512520
default:
@@ -1060,7 +1068,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
10601068
}
10611069
break
10621070
case 'arm64':
1063-
assert (scenario == 'default') || (scenario == 'pri1r2r')
1071+
assert (scenario == 'default') || (scenario == 'pri1r2r') || (scenario == 'gcstress0xc')
10641072

10651073
// Set up a private trigger
10661074
def contextString = "${os} ${architecture} Cross ${configuration}"
@@ -1081,6 +1089,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
10811089
"(?i).*test\\W+${os}\\W+${architecture}\\W+${configuration}", null, arm64Users)
10821090
break
10831091
case 'pri1r2r':
1092+
case 'gcstress0xc':
10841093
Utilities.addPrivateGithubPRTriggerForBranch(job, branch, contextString,
10851094
"(?i).*test\\W+${os}\\W+${architecture}\\W+${configuration}\\W+${scenario}", null, arm64Users)
10861095
break
@@ -1314,9 +1323,17 @@ combinedScenarios.each { scenario ->
13141323
return
13151324
}
13161325

1317-
// No stress modes except on x64 right now (mainly because of bad test state on x86)
1318-
if (architecture != 'x64') {
1319-
return
1326+
switch (architecture) {
1327+
case 'arm64':
1328+
if (scenario != 'gcstress0xc') {
1329+
return
1330+
}
1331+
break
1332+
case 'x64':
1333+
// Everything implemented
1334+
break
1335+
default:
1336+
return
13201337
}
13211338
}
13221339
else {
@@ -1632,10 +1649,7 @@ combinedScenarios.each { scenario ->
16321649

16331650
break
16341651
case 'arm64':
1635-
assert (scenario == 'default') || (scenario == 'pri1r2r')
1636-
1637-
// Up the timeout for arm64 jobs.
1638-
Utilities.setJobTimeout(newJob, 240);
1652+
assert (scenario == 'default') || (scenario == 'pri1r2r') || (scenario == 'gcstress0xc')
16391653

16401654
// Debug runs take too long to run. So build job only.
16411655
if (lowerConfiguration == "debug") {

0 commit comments

Comments
 (0)