Skip to content

Modernize CI configuration: Modern = RS4 + Dev 15.7; Legacy = (2008 R2 & 2012 R2) + Dev14 #5307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 29, 2018
Merged

Modernize CI configuration: Modern = RS4 + Dev 15.7; Legacy = (2008 R2 & 2012 R2) + Dev14 #5307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98cbeff
Modernize CI configuration: Modern = RS4 + Dev 15.7; Legacy = 2008 R2…
dilijev Jun 26, 2018
7ea3fce
Add CI check and daily builds for Legacy 2012 R2 ~= Windows 8.1 Blue;…
dilijev Jun 26, 2018
40aa6f9
Due to machine config issue, build ARM on Legacy Windows 8.1
dilijev Jun 28, 2018
7bfeb2e
Add daily builds of Lite config; update daily trigger phrases
dilijev Jun 28, 2018
282688b
Differentiate OS versions.
dilijev Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions Build/scripts/add_msbuild_path.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
:: add_msbuild_path.cmd
::
:: Locate msbuild.exe and add it to the PATH
set USE_MSBUILD_12=%1
set FORCE_MSBUILD_VERSION=%1

if "%USE_MSBUILD_12%" == "True" (
echo Skipping Dev15 and trying Dev12...
goto :LABEL_USE_MSBUILD_12
if "%FORCE_MSBUILD_VERSION%" == "msbuild14" (
echo Skipping Dev15 and trying Dev14...
goto :LABEL_USE_MSBUILD_14
)

where /q msbuild.exe
Expand All @@ -20,8 +20,10 @@ if "%ERRORLEVEL%" == "0" (

REM Try Dev15 first

set MSBUILD_VERSION=15.0
echo Trying to locate Dev15...

:LABEL_USE_MSBUILD_15
set MSBUILD_VERSION=15.0
set "MSBUILD_PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\Preview\Enterprise\MSBuild\15.0\Bin"

if not exist "%MSBUILD_PATH%\msbuild.exe" (
Expand All @@ -40,8 +42,9 @@ if exist "%MSBUILD_PATH%\msbuild.exe" (
goto :MSBuildFound
)

echo Dev15 not found, trying Dev14...
echo Dev15 not found, trying to locate Dev14...

:LABEL_USE_MSBUILD_14
set MSBUILD_VERSION=14.0
set "MSBUILD_PATH=%ProgramFiles%\msbuild\%MSBUILD_VERSION%\Bin\x86"

Expand All @@ -57,7 +60,7 @@ if exist "%MSBUILD_PATH%\msbuild.exe" (
goto :MSBuildFound
)

echo Dev14 not found, trying Dev12...
echo Dev14 not found, trying to locate Dev12...

:LABEL_USE_MSBUILD_12
set MSBUILD_VERSION=12.0
Expand Down
87 changes: 71 additions & 16 deletions netci.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,31 @@ def msbuildTypeMap = [

// convert `machine` parameter to OS component of PR task name
def machineTypeToOSTagMap = [
'Windows_NT': 'Windows', // Windows Server 2012 R2, equivalent to Windows 8.1 (aka Blue)
'Windows 7': 'Windows 7', // 'latest-or-auto' -> Windows Server 2008 R2 ~= Windows 7
'Windows_NT': 'Windows 8.1', // 'latest-or-auto' -> Windows Server 2012 R2 ~= Windows 8.1 aka Blue
'windows.10.amd64.clientrs4.devex.open': 'Windows 10', // = Windows 10 RS4 with Dev 15.7
'Ubuntu16.04': 'Ubuntu',
'OSX10.12': 'OSX'
]

def defaultMachineTag = 'latest-or-auto'

def legacyWindows7Machine = 'Windows 7'
def legacyWindows7MachineTag = defaultMachineTag

def legacyWindows8Machine = 'Windows_NT'
def legacyWindows8MachineTag = defaultMachineTag

def latestWindowsMachine = 'windows.10.amd64.clientrs4.devex.open' // Windows 10 RS4 with Dev 15.7
def latestWindowsMachineTag = null // all information is included in the machine name above

def dailyRegex = 'dailies'

// ---------------
// HELPER CLOSURES
// ---------------

def CreateBuildTask = { isPR, buildArch, buildType, machine, configTag, buildExtra, testExtra, runCodeAnalysis, excludeConfigIf, nonDefaultTaskSetup ->
def CreateBuildTask = { isPR, buildArch, buildType, machine, machineTag, configTag, buildExtra, testExtra, runCodeAnalysis, excludeConfigIf, nonDefaultTaskSetup ->
if (excludeConfigIf && excludeConfigIf(isPR, buildArch, buildType)) {
return // early exit: we don't want to create a job for this configuration
}
Expand Down Expand Up @@ -75,7 +88,13 @@ def CreateBuildTask = { isPR, buildArch, buildType, machine, configTag, buildExt
false, // doNotFailIfNothingArchived=false ~= failIfNothingArchived
false) // archiveOnlyIfSuccessful=false ~= archiveAlways

Utilities.setMachineAffinity(newJob, machine, 'latest-or-auto')
if (machineTag == null) {
// note: this is a different overload and not equivalent to calling setMachineAffinity(_,_,null)
Utilities.setMachineAffinity(newJob, machine)
} else {
Utilities.setMachineAffinity(newJob, machine, machineTag)
}

Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

if (nonDefaultTaskSetup == null) {
Expand All @@ -95,11 +114,11 @@ def CreateBuildTask = { isPR, buildArch, buildType, machine, configTag, buildExt
}
}

def CreateBuildTasks = { machine, configTag, buildExtra, testExtra, runCodeAnalysis, excludeConfigIf, nonDefaultTaskSetup ->
def CreateBuildTasks = { machine, machineTag, configTag, buildExtra, testExtra, runCodeAnalysis, excludeConfigIf, nonDefaultTaskSetup ->
[true, false].each { isPR ->
['x86', 'x64', 'arm'].each { buildArch ->
['debug', 'test', 'release'].each { buildType ->
CreateBuildTask(isPR, buildArch, buildType, machine, configTag, buildExtra, testExtra, runCodeAnalysis, excludeConfigIf, nonDefaultTaskSetup)
CreateBuildTask(isPR, buildArch, buildType, machine, machineTag, configTag, buildExtra, testExtra, runCodeAnalysis, excludeConfigIf, nonDefaultTaskSetup)
}
}
}
Expand Down Expand Up @@ -142,7 +161,7 @@ def CreateXPlatBuildTask = { isPR, buildType, staticBuild, machine, platform, co
true, // doNotFailIfNothingArchived=false ~= failIfNothingArchived (true ~= doNotFail)
false) // archiveOnlyIfSuccessful=false ~= archiveAlways

Utilities.setMachineAffinity(newJob, machine, 'latest-or-auto')
Utilities.setMachineAffinity(newJob, machine, defaultMachineTag)
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

if (nonDefaultTaskSetup == null) {
Expand Down Expand Up @@ -213,47 +232,83 @@ def CreateStyleCheckTasks = { taskString, taskName, checkName ->
Utilities.addGithubPushTrigger(newJob)
}

Utilities.setMachineAffinity(newJob, 'Ubuntu16.04', 'latest-or-auto')
Utilities.setMachineAffinity(newJob, 'Ubuntu16.04', defaultMachineTag)
}
}

// ----------------
// INNER LOOP TASKS
// ----------------

CreateBuildTasks('Windows_NT', null, null, "-winBlue", true, null, null)
// 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.
CreateBuildTasks(latestWindowsMachine, latestWindowsMachineTag, null, null, "-win10", true,
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch == 'arm') }, null)
CreateBuildTasks(legacyWindows8Machine, legacyWindows8MachineTag, null, null, "-winBlue", true,
/* excludeConfigIf */ { isPR, buildArch, buildType -> (buildArch != 'arm') }, null)

// Add some additional daily configs to trigger per-PR as a quality gate:
// x64_debug Slow Tests
CreateBuildTask(true, 'x64', 'debug',
'Windows_NT', 'ci_slow', null, '-winBlue -includeSlow', false, null, null)
latestWindowsMachine, latestWindowsMachineTag, 'ci_slow', null, '-win10 -includeSlow', false, null, null)
// x64_debug DisableJIT
CreateBuildTask(true, 'x64', 'debug',
'Windows_NT', 'ci_disablejit', '"/p:BuildJIT=false"', '-winBlue -disablejit', false, null, null)
latestWindowsMachine, latestWindowsMachineTag, 'ci_disablejit', '"/p:BuildJIT=false"', '-win10 -disablejit', false, null, null)
// x64_debug Lite
CreateBuildTask(true, 'x64', 'debug',
'Windows_NT', 'ci_lite', '"/p:BuildLite=true"', '-winBlue -lite', false, null, null)
latestWindowsMachine, latestWindowsMachineTag, 'ci_lite', '"/p:BuildLite=true"', '-win10 -lite', false, null, null)
// x64_debug Legacy (Windows 7)
CreateBuildTask(true, 'x64', 'debug',
legacyWindows7Machine, legacyWindows7MachineTag, 'ci_legacy7', 'msbuild14', '-win7 -includeSlow', false, null, null)
// x64_debug Legacy (Windows 8.1 (Blue))
CreateBuildTask(true, 'x64', 'debug',
legacyWindows8Machine, legacyWindows8MachineTag, 'ci_legacy8', 'msbuild14', '-winBlue -includeSlow', false, null, null)

// -----------------
// DAILY BUILD TASKS
// -----------------

if (!branch.endsWith('-ci')) {
// build and test on the usual configuration (VS 2015) with -includeSlow
CreateBuildTasks('Windows_NT', 'daily_slow', null, '-winBlue -includeSlow', false,
// 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') },
/* 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') },
/* 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
CreateBuildTasks(latestWindowsMachine, latestWindowsMachineTag, 'daily_slow', null, '-win10 -includeSlow', false,
/* excludeConfigIf */ null,
/* nonDefaultTaskSetup */ { newJob, isPR, config ->
DailyBuildTaskSetup(newJob, isPR,
"Windows ${config}",
'slow\\s+tests')})

// build and test on the usual configuration (VS 2015) with JIT disabled
CreateBuildTasks('Windows_NT', 'daily_disablejit', '"/p:BuildJIT=false"', '-winBlue -disablejit', true,
// build and test on the latest configuration (RS4 + VS 2017 Dev 15.7) with JIT disabled
CreateBuildTasks(latestWindowsMachine, latestWindowsMachineTag, 'daily_disablejit', '"/p:BuildJIT=false"', '-win10 -disablejit', true,
/* excludeConfigIf */ null,
/* 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
CreateBuildTasks(latestWindowsMachine, latestWindowsMachineTag, 'daily_lite', '"/p:BuildLite=true"', '-win10 -lite', true,
/* excludeConfigIf */ null,
/* nonDefaultTaskSetup */ { newJob, isPR, config ->
DailyBuildTaskSetup(newJob, isPR,
"Windows ${config}",
'lite\\s+tests')})
}

// ----------------
Expand Down Expand Up @@ -292,7 +347,7 @@ if (isXPlatCompatibleBranch) {
CreateXPlatBuildTasks(osString, "linux", "ubuntu", branch, null, "")

// Create a PR/continuous task to check ubuntu/static/debug/no-icu
[true, false].each { isPR ->
[true, false].each { isPR ->
CreateXPlatBuildTask(isPR, "debug", true, osString, "linux",
"ubuntu", branch, null, "--no-icu", "--not-tag exclude_noicu", "")
}
Expand Down
8 changes: 4 additions & 4 deletions test/jenkins.build.init.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ if not "%JENKINS_BUILD%" == "True" (
set REPO_ROOT=%~dp0\..

set JENKINS_BUILD_ARGS=
set JENKINS_USE_MSBUILD_12=
set JENKINS_FORCE_MSBUILD_VERSION=
:ContinueArgParse
if not [%1]==[] (
if [%1]==[msbuild12] (
set JENKINS_USE_MSBUILD_12=True
if [%1]==[msbuild14] (
set JENKINS_FORCE_MSBUILD_VERSION=%1
goto :ContinueArgParseEnd
)

Expand All @@ -36,4 +36,4 @@ if not [%1]==[] (
:: Set up msbuild.exe
:: ========================================

call %REPO_ROOT%\Build\scripts\add_msbuild_path.cmd %JENKINS_USE_MSBUILD_12%
call %REPO_ROOT%\Build\scripts\add_msbuild_path.cmd %JENKINS_FORCE_MSBUILD_VERSION%