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

Commit 0cb88b8

Browse files
authored
Remove FreeBSD 10.1/OpenSuSE 13.2 and Fedora 23 (#13635)
* Remove FreeBSD 10.1 10.1 has been EOL'd, and the image is not upgradeable. This image will become unusable in newer versions of Jenkins. Eliminating from CI. If needed, new versions of BSD could be prepped and re-added to CI. * Eliminate OpenSuSE 13.2 and Fedora 23 (EOL)
1 parent 7fdf86f commit 0cb88b8

File tree

1 file changed

+11
-33
lines changed

1 file changed

+11
-33
lines changed

netci.groovy

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@ def static getOSGroup(def os) {
1616
'RHEL7.2': 'Linux',
1717
'Ubuntu16.04': 'Linux',
1818
'Debian8.4':'Linux',
19-
'Fedora23':'Linux',
2019
'OSX':'OSX',
2120
'Windows_NT':'Windows_NT',
22-
'FreeBSD':'FreeBSD',
2321
'CentOS7.1': 'Linux',
24-
'OpenSUSE13.2': 'Linux',
2522
'OpenSUSE42.1': 'Linux',
2623
'LinuxARMEmulator': 'Linux']
2724
def osGroup = osGroupMap.get(os, null)
@@ -35,8 +32,8 @@ class Constants {
3532
// The Windows_NT_BuildOnly OS is a way to speed up the Non-NT builds temporarily by avoiding
3633
// test execution in the build flow runs. It generates the exact same build
3734
// 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']
4037
// This is a set of JIT stress modes combined with the set of variables that
4138
// need to be set to actually enable that stress mode. The key of the map is the stress mode and
4239
// the values are the environment variables
@@ -281,7 +278,7 @@ def static getJobName(def configuration, def architecture, def os, def scenario,
281278

282279
// **************************
283280
// 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
285282
// builds will do a couple extra steps.
286283
// **************************
287284

@@ -294,7 +291,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
294291
return
295292
}
296293

297-
def bidailyCrossList = ['RHEL7.2', 'Debian8.4', 'OpenSUSE13.2']
294+
def bidailyCrossList = ['RHEL7.2', 'Debian8.4']
298295
// Non pull request builds.
299296
if (!isPR) {
300297
// Check scenario.
@@ -554,8 +551,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
554551
}
555552

556553
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
559555
case 'Debian8.4':
560556
case 'RHEL7.2':
561557
if (scenario == 'default') {
@@ -567,7 +563,6 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
567563
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} Pri 1 Build & Test", "(?i).*test\\W+${os}\\W+${scenario}.*")
568564
}
569565
break
570-
case 'Fedora23':
571566
case 'Ubuntu16.04':
572567
case 'OpenSUSE42.1':
573568
assert !isFlowJob
@@ -1055,12 +1050,6 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
10551050
break
10561051
}
10571052
break
1058-
case 'FreeBSD':
1059-
assert scenario == 'default'
1060-
if (configuration == 'Checked') {
1061-
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} Build")
1062-
}
1063-
break
10641053
default:
10651054
println("Unknown os: ${os}");
10661055
assert false
@@ -1852,7 +1841,6 @@ combinedScenarios.each { scenario ->
18521841
// Run the rest of the build
18531842
// Build the mscorlib for the other OS's
18541843
buildCommands += "build.cmd ${lowerConfiguration} ${arch} linuxmscorlib"
1855-
buildCommands += "build.cmd ${lowerConfiguration} ${arch} freebsdmscorlib"
18561844
buildCommands += "build.cmd ${lowerConfiguration} ${arch} osxmscorlib"
18571845

18581846
// Zip up the tests directory so that we don't use so much space/time copying
@@ -1915,12 +1903,9 @@ combinedScenarios.each { scenario ->
19151903
case 'Ubuntu16.04':
19161904
case 'Debian8.4':
19171905
case 'OSX':
1918-
case 'FreeBSD':
19191906
case 'CentOS7.1':
19201907
case 'RHEL7.2':
1921-
case 'OpenSUSE13.2':
19221908
case 'OpenSUSE42.1':
1923-
case 'Fedora23':
19241909
switch (architecture) {
19251910
case 'x64':
19261911
case 'x86ryujit':
@@ -1938,16 +1923,9 @@ combinedScenarios.each { scenario ->
19381923
if (!enableCorefxTesting) {
19391924
// We run pal tests on all OS but generate mscorlib (and thus, nuget packages)
19401925
// 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}"
19511929
buildCommands += "src/pal/tests/palsuite/runpaltests.sh \${WORKSPACE}/bin/obj/${osGroup}.${arch}.${configuration} \${WORKSPACE}/bin/paltestout"
19521930

19531931
// Set time out
@@ -2114,7 +2092,7 @@ combinedScenarios.each { scenario ->
21142092
return
21152093
}
21162094
//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') {
21182096
return
21192097
}
21202098
}
@@ -2136,8 +2114,8 @@ combinedScenarios.each { scenario ->
21362114
return
21372115
}
21382116
}
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') {
21412119
if (scenario != 'pri1') {
21422120
return
21432121
}

0 commit comments

Comments
 (0)