@@ -14,12 +14,9 @@ def static getOSGroup(def os) {
14
14
' RHEL7.2' : ' Linux' ,
15
15
' Ubuntu16.04' : ' Linux' ,
16
16
' Debian8.2' :' Linux' ,
17
- ' Fedora23' :' Linux' ,
18
17
' OSX' :' OSX' ,
19
18
' Windows_NT' :' Windows_NT' ,
20
- ' FreeBSD' :' FreeBSD' ,
21
19
' CentOS7.1' : ' Linux' ,
22
- ' OpenSUSE13.2' : ' Linux' ,
23
20
' LinuxARMEmulator' : ' Linux' ]
24
21
def osGroup = osGroupMap. get(os, null )
25
22
assert osGroup != null : " Could not find os group for ${ os} "
@@ -32,8 +29,8 @@ class Constants {
32
29
// The Windows_NT_BuildOnly OS is a way to speed up the Non-NT builds temporarily by avoiding
33
30
// test execution in the build flow runs. It generates the exact same build
34
31
// as Windows_NT but without the tests.
35
- def static osList = [' Ubuntu' , ' Debian8.2' , ' OSX' , ' Windows_NT' , ' Windows_NT_BuildOnly' , ' FreeBSD ' , ' CentOS7.1' , ' OpenSUSE13.2 ' , ' RHEL7.2' , ' LinuxARMEmulator' , ' Ubuntu16.04' , ' Fedora23 ' ]
36
- def static crossList = [' Ubuntu' , ' OSX' , ' CentOS7.1' , ' RHEL7.2' , ' Debian8.2' , ' OpenSUSE13.2 ' ]
32
+ def static osList = [' Ubuntu' , ' Debian8.2' , ' OSX' , ' Windows_NT' , ' Windows_NT_BuildOnly' , ' CentOS7.1' , ' RHEL7.2' , ' LinuxARMEmulator' , ' Ubuntu16.04' ]
33
+ def static crossList = [' Ubuntu' , ' OSX' , ' CentOS7.1' , ' RHEL7.2' , ' Debian8.2' ]
37
34
// This is a set of JIT stress modes combined with the set of variables that
38
35
// need to be set to actually enable that stress mode. The key of the map is the stress mode and
39
36
// the values are the environment variables
@@ -260,7 +257,7 @@ def static getJobName(def configuration, def architecture, def os, def scenario,
260
257
261
258
// **************************
262
259
// Define the basic inner loop builds for PR and commit. This is basically just the set
263
- // of coreclr builds over linux/osx/freebsd/ windows and debug/release/checked. In addition, the windows
260
+ // of coreclr builds over linux/osx/windows and debug/release/checked. In addition, the windows
264
261
// builds will do a couple extra steps.
265
262
// **************************
266
263
@@ -273,7 +270,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
273
270
return
274
271
}
275
272
276
- def bidailyCrossList = [' RHEL7.2' , ' Debian8.2' , ' OpenSUSE13.2 ' ]
273
+ def bidailyCrossList = [' RHEL7.2' , ' Debian8.2' ]
277
274
// Non pull request builds.
278
275
if (! isPR) {
279
276
// Check scenario.
@@ -482,8 +479,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
482
479
break
483
480
}
484
481
switch (os) {
485
- // OpenSUSE, Debian & RedHat get trigger phrases for pri 0 build, and pri 1 build & test
486
- case ' OpenSUSE13.2' :
482
+ // Debian & RedHat get trigger phrases for pri 0 build, and pri 1 build & test
487
483
case ' Debian8.2' :
488
484
case ' RHEL7.2' :
489
485
if (scenario == ' default' ) {
@@ -495,7 +491,6 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
495
491
Utilities . addGithubPRTriggerForBranch(job, branch, " ${ os} ${ architecture} ${ configuration} Pri 1 Build & Test" , " (?i).*test\\ W+${ os} \\ W+${ scenario} .*" )
496
492
}
497
493
break
498
- case ' Fedora23' :
499
494
case ' Ubuntu16.04' :
500
495
assert ! isFlowJob
501
496
assert scenario == ' default'
@@ -982,12 +977,6 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
982
977
break
983
978
}
984
979
break
985
- case ' FreeBSD' :
986
- assert scenario == ' default'
987
- if (configuration == ' Checked' ) {
988
- Utilities . addGithubPRTriggerForBranch(job, branch, " ${ os} ${ architecture} ${ configuration} Build" )
989
- }
990
- break
991
980
default :
992
981
println (" Unknown os: ${ os} " );
993
982
assert false
@@ -1543,7 +1532,6 @@ combinedScenarios.each { scenario ->
1543
1532
// Run the rest of the build
1544
1533
// Build the mscorlib for the other OS's
1545
1534
buildCommands + = " build.cmd ${ lowerConfiguration} ${ arch} linuxmscorlib"
1546
- buildCommands + = " build.cmd ${ lowerConfiguration} ${ arch} freebsdmscorlib"
1547
1535
buildCommands + = " build.cmd ${ lowerConfiguration} ${ arch} osxmscorlib"
1548
1536
1549
1537
// Zip up the tests directory so that we don't use so much space/time copying
@@ -1604,11 +1592,8 @@ combinedScenarios.each { scenario ->
1604
1592
case ' Ubuntu16.04' :
1605
1593
case ' Debian8.2' :
1606
1594
case ' OSX' :
1607
- case ' FreeBSD' :
1608
1595
case ' CentOS7.1' :
1609
1596
case ' RHEL7.2' :
1610
- case ' OpenSUSE13.2' :
1611
- case ' Fedora23' :
1612
1597
switch (architecture) {
1613
1598
case ' x64' :
1614
1599
case ' x86ryujit' :
@@ -1621,11 +1606,7 @@ combinedScenarios.each { scenario ->
1621
1606
if (! enableCorefxTesting) {
1622
1607
// We run pal tests on all OS but generate mscorlib (and thus, nuget packages)
1623
1608
// only on supported OS platforms.
1624
- if ((os == ' FreeBSD' ) || (os == ' OpenSUSE13.2' ))
1625
- {
1626
- buildCommands + = " ./build.sh skipmscorlib verbose ${ lowerConfiguration} ${ arch} "
1627
- }
1628
- else if (scenario == ' coverage' )
1609
+ if (scenario == ' coverage' )
1629
1610
{
1630
1611
assert os == ' Ubuntu'
1631
1612
assert lowerConfiguration == ' release'
@@ -1778,7 +1759,7 @@ combinedScenarios.each { scenario ->
1778
1759
return
1779
1760
}
1780
1761
// Skip stress modes for these scenarios
1781
- if (os == ' RHEL7.2' || os == ' Debian8.2' || os == ' OpenSUSE13.2 ' ) {
1762
+ if (os == ' RHEL7.2' || os == ' Debian8.2' ) {
1782
1763
return
1783
1764
}
1784
1765
}
@@ -1800,8 +1781,8 @@ combinedScenarios.each { scenario ->
1800
1781
return
1801
1782
}
1802
1783
}
1803
- // For RedHat, Debian, and OpenSUSE , we only do Release pri1 builds.
1804
- else if (os == ' RHEL7.2' || os == ' Debian8.2' || os == ' OpenSUSE13.2 ' ) {
1784
+ // For RedHat and Debian , we only do Release pri1 builds.
1785
+ else if (os == ' RHEL7.2' || os == ' Debian8.2' ) {
1805
1786
if (scenario != ' pri1' ) {
1806
1787
return
1807
1788
}
0 commit comments