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

Commit bc559a0

Browse files
committed
Work around Jenkins problem with large env vars
Clear out `ghprbCommentBody` before msbuild is invoked, which can't deal with large environment variables.
1 parent 5952ead commit bc559a0

File tree

3 files changed

+57
-21
lines changed

3 files changed

+57
-21
lines changed

build.cmd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ if defined VS150COMNTOOLS (
2222
set __VSVersion=vs2015
2323
)
2424

25+
:: Work around Jenkins CI + msbuild problem: Jenkins sometimes creates very large environment
26+
:: variables, and msbuild can't handle environment blocks with such large variables. So clear
27+
:: out the variables that might be too large.
28+
set ghprbCommentBody=
29+
2530
:: Note that the msbuild project files (specifically, dir.proj) will use the following variables, if set:
2631
:: __BuildArch -- default: x64
2732
:: __BuildType -- default: Debug

build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#!/usr/bin/env bash
22

3+
# Work around Jenkins CI + msbuild problem: Jenkins sometimes creates very large environment
4+
# variables, and msbuild can't handle environment blocks with such large variables. So clear
5+
# out the variables that might be too large.
6+
export ghprbCommentBody=
7+
38
# resolve python-version to use
49
if [ "$PYTHON" == "" ] ; then
510
if ! PYTHON=$(command -v python2.7 || command -v python2 || command -v python)

netci.groovy

Lines changed: 47 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,8 +1110,11 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def
11101110
}
11111111
else {
11121112
// Currently no push triggers, with limited arm Linux hardware.
1113+
// TODO: If we have enough machine capacity, add some arm Linux push triggers.
11131114
assert os == 'Ubuntu'
1114-
addPeriodicTriggerHelper(job, '@daily')
1115+
if (isFlowJob) {
1116+
addPeriodicTriggerHelper(job, '@daily')
1117+
}
11151118
}
11161119
break
11171120
case 'armem':
@@ -1289,22 +1292,34 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def
12891292
case 'corefx_jitstressregs0x80':
12901293
case 'corefx_jitstressregs0x1000':
12911294
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')
13001307
}
13011308
break
13021309
case 'heapverify1':
13031310
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
13071316
}
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')
13081323
break
13091324
case 'gcstress0xc':
13101325
case 'gcstress0xc_zapdisable':
@@ -1313,11 +1328,22 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def
13131328
case 'gcstress0xc_jitstress1':
13141329
case 'gcstress0xc_jitstress2':
13151330
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
13201344
}
1345+
assert (os == 'Windows_NT') || (os in Constants.crossList)
1346+
addPeriodicTriggerHelper(job, '@weekly')
13211347
break
13221348

13231349
case 'illink':
@@ -3221,11 +3247,6 @@ def static CreateTestJob(def dslFactory, def project, def branch, def architectu
32213247
// Returns the new flow job.
32223248
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)
32233249
{
3224-
if (os == 'RHEL7.2' || os == 'Debian8.4') {
3225-
// Do not create the flow job for RHEL jobs.
3226-
return
3227-
}
3228-
32293250
// Windows CoreCLR build and Linux CoreCLR build (in parallel) ->
32303251
// Linux CoreCLR test
32313252
def flowJobName = getJobName(configuration, architecture, os, scenario, false) + "_flow"
@@ -3522,6 +3543,11 @@ Constants.allScenarios.each { scenario ->
35223543
// Create a build flow to join together the build and tests required to run this test.
35233544
// =============================================================================================
35243545

3546+
if (os == 'RHEL7.2' || os == 'Debian8.4') {
3547+
// Do not create the flow job for RHEL jobs.
3548+
return
3549+
}
3550+
35253551
def fullTestJobName = projectFolder + '/' + testJob.name
35263552
def flowJob = CreateFlowJob(this, project, branch, architecture, os, configuration, scenario, isPR, fullTestJobName, inputCoreCLRBuildName, inputTestsBuildName)
35273553

0 commit comments

Comments
 (0)