@@ -16,12 +16,9 @@ def static getOSGroup(def os) {
16
16
' RHEL7.2' : ' Linux' ,
17
17
' Ubuntu16.04' : ' Linux' ,
18
18
' Debian8.4' :' Linux' ,
19
- ' Fedora23' :' Linux' ,
20
19
' OSX' :' OSX' ,
21
20
' Windows_NT' :' Windows_NT' ,
22
- ' FreeBSD' :' FreeBSD' ,
23
21
' CentOS7.1' : ' Linux' ,
24
- ' OpenSUSE13.2' : ' Linux' ,
25
22
' OpenSUSE42.1' : ' Linux' ,
26
23
' LinuxARMEmulator' : ' Linux' ]
27
24
def osGroup = osGroupMap. get(os, null )
@@ -35,8 +32,8 @@ class Constants {
35
32
// The Windows_NT_BuildOnly OS is a way to speed up the Non-NT builds temporarily by avoiding
36
33
// test execution in the build flow runs. It generates the exact same build
37
34
// as Windows_NT but without the tests.
38
- def static osList = [' Ubuntu' , ' Debian8.4' , ' OSX' , ' Windows_NT' , ' Windows_NT_BuildOnly' , ' FreeBSD ' , ' CentOS7.1' , ' OpenSUSE13.2 ' , ' OpenSUSE42.1' , ' RHEL7.2' , ' LinuxARMEmulator' , ' Ubuntu16.04' , ' Fedora23 ' ]
39
- def static crossList = [' Ubuntu' , ' OSX' , ' CentOS7.1' , ' RHEL7.2' , ' Debian8.4' , ' OpenSUSE13.2 ' ]
35
+ def static osList = [' Ubuntu' , ' Debian8.4' , ' OSX' , ' Windows_NT' , ' Windows_NT_BuildOnly' , ' CentOS7.1' , ' OpenSUSE42.1' , ' RHEL7.2' , ' LinuxARMEmulator' , ' Ubuntu16.04' ]
36
+ def static crossList = [' Ubuntu' , ' OSX' , ' CentOS7.1' , ' RHEL7.2' , ' Debian8.4' ]
40
37
// This is a set of JIT stress modes combined with the set of variables that
41
38
// need to be set to actually enable that stress mode. The key of the map is the stress mode and
42
39
// the values are the environment variables
@@ -281,7 +278,7 @@ def static getJobName(def configuration, def architecture, def os, def scenario,
281
278
282
279
// **************************
283
280
// Define the basic inner loop builds for PR and commit. This is basically just the set
284
- // of coreclr builds over linux/osx/freebsd/ windows and debug/release/checked. In addition, the windows
281
+ // of coreclr builds over linux/osx/windows and debug/release/checked. In addition, the windows
285
282
// builds will do a couple extra steps.
286
283
// **************************
287
284
@@ -294,7 +291,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
294
291
return
295
292
}
296
293
297
- def bidailyCrossList = [' RHEL7.2' , ' Debian8.4' , ' OpenSUSE13.2 ' ]
294
+ def bidailyCrossList = [' RHEL7.2' , ' Debian8.4' ]
298
295
// Non pull request builds.
299
296
if (! isPR) {
300
297
// Check scenario.
@@ -554,8 +551,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
554
551
}
555
552
556
553
switch (os) {
557
- // OpenSUSE, Debian & RedHat get trigger phrases for pri 0 build, and pri 1 build & test
558
- case ' OpenSUSE13.2' :
554
+ // Debian & RedHat get trigger phrases for pri 0 build, and pri 1 build & test
559
555
case ' Debian8.4' :
560
556
case ' RHEL7.2' :
561
557
if (scenario == ' default' ) {
@@ -567,7 +563,6 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
567
563
Utilities . addGithubPRTriggerForBranch(job, branch, " ${ os} ${ architecture} ${ configuration} Pri 1 Build & Test" , " (?i).*test\\ W+${ os} \\ W+${ scenario} .*" )
568
564
}
569
565
break
570
- case ' Fedora23' :
571
566
case ' Ubuntu16.04' :
572
567
case ' OpenSUSE42.1' :
573
568
assert ! isFlowJob
@@ -1055,12 +1050,6 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
1055
1050
break
1056
1051
}
1057
1052
break
1058
- case ' FreeBSD' :
1059
- assert scenario == ' default'
1060
- if (configuration == ' Checked' ) {
1061
- Utilities . addGithubPRTriggerForBranch(job, branch, " ${ os} ${ architecture} ${ configuration} Build" )
1062
- }
1063
- break
1064
1053
default :
1065
1054
println (" Unknown os: ${ os} " );
1066
1055
assert false
@@ -1852,7 +1841,6 @@ combinedScenarios.each { scenario ->
1852
1841
// Run the rest of the build
1853
1842
// Build the mscorlib for the other OS's
1854
1843
buildCommands + = " build.cmd ${ lowerConfiguration} ${ arch} linuxmscorlib"
1855
- buildCommands + = " build.cmd ${ lowerConfiguration} ${ arch} freebsdmscorlib"
1856
1844
buildCommands + = " build.cmd ${ lowerConfiguration} ${ arch} osxmscorlib"
1857
1845
1858
1846
// Zip up the tests directory so that we don't use so much space/time copying
@@ -1915,12 +1903,9 @@ combinedScenarios.each { scenario ->
1915
1903
case ' Ubuntu16.04' :
1916
1904
case ' Debian8.4' :
1917
1905
case ' OSX' :
1918
- case ' FreeBSD' :
1919
1906
case ' CentOS7.1' :
1920
1907
case ' RHEL7.2' :
1921
- case ' OpenSUSE13.2' :
1922
1908
case ' OpenSUSE42.1' :
1923
- case ' Fedora23' :
1924
1909
switch (architecture) {
1925
1910
case ' x64' :
1926
1911
case ' x86ryujit' :
@@ -1938,16 +1923,9 @@ combinedScenarios.each { scenario ->
1938
1923
if (! enableCorefxTesting) {
1939
1924
// We run pal tests on all OS but generate mscorlib (and thus, nuget packages)
1940
1925
// only on supported OS platforms.
1941
- if ((os == ' FreeBSD' ) || (os == ' OpenSUSE13.2' ))
1942
- {
1943
- buildCommands + = " ./build.sh skipmscorlib verbose ${ lowerConfiguration} ${ arch} "
1944
- }
1945
- else
1946
- {
1947
- def bootstrapRid = Utilities . getBoostrapPublishRid(os)
1948
- def bootstrapRidEnv = bootstrapRid != null ? " __PUBLISH_RID=${ bootstrapRid} " : ' '
1949
- buildCommands + = " ${ bootstrapRidEnv} ./build.sh verbose ${ lowerConfiguration} ${ arch} "
1950
- }
1926
+ def bootstrapRid = Utilities . getBoostrapPublishRid(os)
1927
+ def bootstrapRidEnv = bootstrapRid != null ? " __PUBLISH_RID=${ bootstrapRid} " : ' '
1928
+ buildCommands + = " ${ bootstrapRidEnv} ./build.sh verbose ${ lowerConfiguration} ${ arch} "
1951
1929
buildCommands + = " src/pal/tests/palsuite/runpaltests.sh \$ {WORKSPACE}/bin/obj/${ osGroup} .${ arch} .${ configuration} \$ {WORKSPACE}/bin/paltestout"
1952
1930
1953
1931
// Set time out
@@ -2114,7 +2092,7 @@ combinedScenarios.each { scenario ->
2114
2092
return
2115
2093
}
2116
2094
// Skip stress modes for these scenarios
2117
- if (os == ' RHEL7.2' || os == ' Debian8.4' || os == ' OpenSUSE13.2 ' ) {
2095
+ if (os == ' RHEL7.2' || os == ' Debian8.4' ) {
2118
2096
return
2119
2097
}
2120
2098
}
@@ -2136,8 +2114,8 @@ combinedScenarios.each { scenario ->
2136
2114
return
2137
2115
}
2138
2116
}
2139
- // For RedHat, Debian, and OpenSUSE , we only do Release pri1 builds.
2140
- else if (os == ' RHEL7.2' || os == ' Debian8.4' || os == ' OpenSUSE13.2 ' ) {
2117
+ // For RedHat and Debian , we only do Release pri1 builds.
2118
+ else if (os == ' RHEL7.2' || os == ' Debian8.4' ) {
2141
2119
if (scenario != ' pri1' ) {
2142
2120
return
2143
2121
}
0 commit comments