Skip to content

Commit

Permalink
[1.10>master] [MERGE #5404 @dilijev] Jenkins: Fix daily builds of ARM…
Browse files Browse the repository at this point in the history 
… 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.
  • Loading branch information
@dilijev
dilijev committed Jun 30, 2018
2 parents 3589d49 + 33c6ecb commit fc08987
Showing 1 changed file with 29 additions and 8 deletions.
37 changes: 29 additions & 8 deletions netci.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,11 @@ def CreateStyleCheckTasks = { taskString, taskName, checkName ->

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

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

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

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

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

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

0 comments on commit fc08987

Please sign in to comment.