Skip to content

Commit 33c6ecb

Browse files
committed
[MERGE #5404 @dilijev] Jenkins: Fix daily builds of ARM by building on Windows 8.1 for now.
Merge pull request #5404 from dilijev:fix-jenkins-arm Note: there's no actual problem with building ARM on Windows 10, but the Windows 10 image we're using has a configuration problem (possibly missing SDK) that is preventing our ARM builds from working there at the moment. This change will make the daily CI green and get us some Jenkins ARM coverage while we sort out the issues.
2 parents f7e7a95 + da72aa7 commit 33c6ecb

File tree

1 file changed

+29
-8
lines changed

1 file changed

+29
-8
lines changed

netci.groovy

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,11 @@ def CreateStyleCheckTasks = { taskString, taskName, checkName ->
242242

243243
// The latest machine seems to have a configuration problem preventing us from building ARM.
244244
// For now, build ARM on the LKG config, Legacy Windows 8.1 (Blue) config.
245-
// TODO When the configuration is updated, unify this config split.
245+
// TODO When the Windows 10 configuration is updated to fix ARM builds, unify this config split.
246246
CreateBuildTasks(latestWindowsMachine, latestWindowsMachineTag, null, null, "-win10", true,
247-
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch == 'arm') }, null)
247+
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch == 'arm') }, null) // configures everything except ARM
248248
CreateBuildTasks(legacyWindows8Machine, legacyWindows8MachineTag, null, null, "-winBlue", true,
249-
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch != 'arm') }, null)
249+
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch != 'arm') }, null) // configures ARM
250250

251251
// Add some additional daily configs to trigger per-PR as a quality gate:
252252
// x64_debug Slow Tests
@@ -272,39 +272,60 @@ CreateBuildTask(true, 'x64', 'debug',
272272
if (!branch.endsWith('-ci')) {
273273
// build and test on the legacy configuration (Windows 7 + VS 2015 (Dev14))
274274
CreateBuildTasks(legacyWindows7Machine, legacyWindows7MachineTag, 'daily_legacy7', 'msbuild14', '-win7 -includeSlow', false,
275-
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch == 'arm') },
275+
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch == 'arm') }, // excludes ARM
276276
/* nonDefaultTaskSetup */ { newJob, isPR, config ->
277277
DailyBuildTaskSetup(newJob, isPR,
278278
"Windows 7 ${config}",
279279
'legacy7?\\s+tests)')})
280280

281281
// build and test on the legacy configuration (Windows 8.1 (Blue) + VS 2015 (Dev14))
282282
CreateBuildTasks(legacyWindows8Machine, legacyWindows8MachineTag, 'daily_legacy8', 'msbuild14', '-winBlue -includeSlow', false,
283-
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch == 'arm') },
283+
/* excludeConfigIf */ null, // ARM builds previously worked on this configuration, so don't exclude them unless we explicitly drop support
284284
/* nonDefaultTaskSetup */ { newJob, isPR, config ->
285285
DailyBuildTaskSetup(newJob, isPR,
286286
"Windows 8 ${config}",
287287
'legacy8?\\s+tests')})
288288

289289
// build and test on the latest configuration (RS4 + VS 2017 Dev 15.7) with -includeSlow
290+
// TODO When the Windows 10 configuration is updated to fix ARM builds, unify this config split.
290291
CreateBuildTasks(latestWindowsMachine, latestWindowsMachineTag, 'daily_slow', null, '-win10 -includeSlow', false,
291-
/* excludeConfigIf */ null,
292+
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch == 'arm') }, // configures everything except ARM
293+
/* nonDefaultTaskSetup */ { newJob, isPR, config ->
294+
DailyBuildTaskSetup(newJob, isPR,
295+
"Windows ${config}",
296+
'slow\\s+tests')})
297+
CreateBuildTasks(legacyWindows8Machine, legacyWindows8MachineTag, 'daily_slow', null, '-winBlue -includeSlow', false,
298+
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch != 'arm') }, // configures ARM
292299
/* nonDefaultTaskSetup */ { newJob, isPR, config ->
293300
DailyBuildTaskSetup(newJob, isPR,
294301
"Windows ${config}",
295302
'slow\\s+tests')})
296303

297304
// build and test on the latest configuration (RS4 + VS 2017 Dev 15.7) with JIT disabled
305+
// TODO When the Windows 10 configuration is updated to fix ARM builds, unify this config split.
298306
CreateBuildTasks(latestWindowsMachine, latestWindowsMachineTag, 'daily_disablejit', '"/p:BuildJIT=false"', '-win10 -disablejit', true,
299-
/* excludeConfigIf */ null,
307+
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch == 'arm') }, // configures everything except ARM
308+
/* nonDefaultTaskSetup */ { newJob, isPR, config ->
309+
DailyBuildTaskSetup(newJob, isPR,
310+
"Windows ${config}",
311+
'(disablejit|nojit)\\s+tests')})
312+
CreateBuildTasks(legacyWindows8Machine, legacyWindows8MachineTag, 'daily_disablejit', '"/p:BuildJIT=false"', '-winBlue -disablejit', true,
313+
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch != 'arm') }, // configures ARM
300314
/* nonDefaultTaskSetup */ { newJob, isPR, config ->
301315
DailyBuildTaskSetup(newJob, isPR,
302316
"Windows ${config}",
303317
'(disablejit|nojit)\\s+tests')})
304318

305319
// build and test on the latest configuration (RS4 + VS 2017 Dev 15.7) with Lite build
320+
// TODO When the Windows 10 configuration is updated to fix ARM builds, unify this config split.
306321
CreateBuildTasks(latestWindowsMachine, latestWindowsMachineTag, 'daily_lite', '"/p:BuildLite=true"', '-win10 -lite', true,
307-
/* excludeConfigIf */ null,
322+
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch == 'arm') }, // configures everything except ARM
323+
/* nonDefaultTaskSetup */ { newJob, isPR, config ->
324+
DailyBuildTaskSetup(newJob, isPR,
325+
"Windows ${config}",
326+
'lite\\s+tests')})
327+
CreateBuildTasks(legacyWindows8Machine, legacyWindows8MachineTag, 'daily_lite', '"/p:BuildLite=true"', '-winBlue -lite', true,
328+
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch != 'arm') }, // configures ARM
308329
/* nonDefaultTaskSetup */ { newJob, isPR, config ->
309330
DailyBuildTaskSetup(newJob, isPR,
310331
"Windows ${config}",

0 commit comments

Comments
 (0)