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

Commit a308bfc

Browse files
authored
Remove FreeBSD 10.1 (#13636)
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.
1 parent 03f858c commit a308bfc

File tree

1 file changed

+5
-21
lines changed

1 file changed

+5
-21
lines changed

netci.groovy

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ def static getOSGroup(def os) {
2525
'Fedora24':'Linux',
2626
'OSX10.12':'OSX',
2727
'Windows_NT':'Windows_NT',
28-
'FreeBSD':'FreeBSD',
2928
'CentOS7.1': 'Linux',
3029
'OpenSUSE42.1': 'Linux',
3130
'Tizen': 'Linux']
@@ -47,7 +46,6 @@ class Constants {
4746
'OSX10.12',
4847
'Windows_NT',
4948
'Windows_NT_BuildOnly',
50-
'FreeBSD',
5149
'CentOS7.1',
5250
'OpenSUSE42.1',
5351
'RHEL7.2',
@@ -640,7 +638,7 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def
640638

641639
// **************************
642640
// Define the basic inner loop builds for PR and commit. This is basically just the set
643-
// of coreclr builds over linux/osx 10.12/freebsd/windows and debug/release/checked. In addition, the windows
641+
// of coreclr builds over linux/osx 10.12/windows and debug/release/checked. In addition, the windows
644642
// builds will do a couple extra steps.
645643
// **************************
646644

@@ -1034,12 +1032,6 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
10341032
break
10351033
}
10361034
break
1037-
case 'FreeBSD':
1038-
assert scenario == 'default'
1039-
if (configuration == 'Checked') {
1040-
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} Build")
1041-
}
1042-
break
10431035
default:
10441036
println("Unknown os: ${os}");
10451037
assert false
@@ -1482,7 +1474,6 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
14821474
// Run the rest of the build
14831475
// Build the mscorlib for the other OS's
14841476
buildCommands += "build.cmd ${lowerConfiguration} ${arch} linuxmscorlib"
1485-
buildCommands += "build.cmd ${lowerConfiguration} ${arch} freebsdmscorlib"
14861477
buildCommands += "build.cmd ${lowerConfiguration} ${arch} osxmscorlib"
14871478

14881479
// Zip up the tests directory so that we don't use so much space/time copying
@@ -1566,7 +1557,6 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
15661557
case 'Ubuntu16.10':
15671558
case 'Debian8.4':
15681559
case 'OSX10.12':
1569-
case 'FreeBSD':
15701560
case 'CentOS7.1':
15711561
case 'RHEL7.2':
15721562
case 'OpenSUSE42.1':
@@ -1601,16 +1591,10 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
16011591
if (!enableCorefxTesting) {
16021592
// We run pal tests on all OS but generate mscorlib (and thus, nuget packages)
16031593
// only on supported OS platforms.
1604-
if (os == 'FreeBSD')
1605-
{
1606-
buildCommands += "./build.sh skipmscorlib verbose ${lowerConfiguration} ${architecture} ${standaloneGc}"
1607-
}
1608-
else
1609-
{
1610-
def bootstrapRid = Utilities.getBoostrapPublishRid(os)
1611-
def bootstrapRidEnv = bootstrapRid != null ? "__PUBLISH_RID=${bootstrapRid} " : ''
1612-
buildCommands += "${bootstrapRidEnv}./build.sh verbose ${lowerConfiguration} ${architecture} ${standaloneGc}"
1613-
}
1594+
1595+
def bootstrapRid = Utilities.getBoostrapPublishRid(os)
1596+
def bootstrapRidEnv = bootstrapRid != null ? "__PUBLISH_RID=${bootstrapRid} " : ''
1597+
buildCommands += "${bootstrapRidEnv}./build.sh verbose ${lowerConfiguration} ${architecture} ${standaloneGc}"
16141598
buildCommands += "src/pal/tests/palsuite/runpaltests.sh \${WORKSPACE}/bin/obj/${osGroup}.${architecture}.${configuration} \${WORKSPACE}/bin/paltestout"
16151599

16161600
// Set time out

0 commit comments

Comments
 (0)