Merge pull request #1820 from Sridhar-MS/ci-changes
Add RHEL and Windows x86 to CI.
This commit is contained in:
Sridhar Periyasamy
commit
fd4e3b8cfe
3 changed files with 50 additions and 55 deletions
16
README.md
16
README.md
|
|
@ -18,18 +18,18 @@ If you don't find your issue, please file one! However, given that this is a ver
|
||||||
Build Status
|
Build Status
|
||||||
------------
|
------------
|
||||||
|
|
||||||
|Ubuntu 14.04 |Windows |Mac OS X |CentOS 7.1 |
|
|Ubuntu 14.04 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 |RHEL 7.2 |
|
||||||
|:------:|:------:|:------:|:------:|
|
|:------:|:------:|:------:|:------:|:------:|:------:|
|
||||||
||| | |
|
|||| | | |
|
||||||
|
|
||||||
Installers
|
Installers
|
||||||
----------
|
----------
|
||||||
|
|
||||||
| |Ubuntu 14.04 |Windows |Mac OS X |CentOS 7.1 |
|
| |Ubuntu 14.04 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 |RHEL 7.2 |
|
||||||
|---------|:------:|:------:|:------:|:------:|
|
|---------|:------:|:------:|:------:|:------:|:------:|:------:|
|
||||||
|**Version**|||||
|
|**Version**|||||||
|
||||||
|**Installers**|[Download Debian Package](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-ubuntu-x64.latest.deb)|[Download Msi](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-win-x64.latest.exe)|[Download Pkg](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-osx-x64.latest.pkg) |N/A |
|
|**Installers**|[Download Debian Package](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-ubuntu-x64.latest.deb)|[Download Msi](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-win-x64.latest.exe)|[Download Msi](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-win-x86.latest.exe)|[Download Pkg](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-osx-x64.latest.pkg) |N/A |N/A |
|
||||||
|**Binaries**|[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz)|[Download zip file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-win-x64.latest.zip)|[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-osx-x64.latest.tar.gz) |[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-centos-x64.latest.tar.gz) |
|
|**Binaries**|[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz)|[Download zip file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-win-x64.latest.zip)|[Download zip file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-win-x86.latest.zip)|[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-osx-x64.latest.tar.gz) |[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-centos-x64.latest.tar.gz)|[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-rhel-x64.latest.tar.gz) |
|
||||||
|
|
||||||
Interested in .NET Core + ASP.NET Core 1.0 RC1 bits?
|
Interested in .NET Core + ASP.NET Core 1.0 RC1 bits?
|
||||||
----------------------------------------------------
|
----------------------------------------------------
|
||||||
|
|
|
||||||
87
netci.groovy
87
netci.groovy
|
|
@ -7,61 +7,56 @@ import jobs.generation.Utilities;
|
||||||
|
|
||||||
def project = GithubProject
|
def project = GithubProject
|
||||||
def branch = GithubBranchName
|
def branch = GithubBranchName
|
||||||
|
def isPR = true
|
||||||
|
|
||||||
def osList = ['Ubuntu', 'OSX', 'Windows_NT', 'Windows_2016', 'CentOS7.1']
|
def platformList = ['Ubuntu:x64:Debug', 'Ubuntu:x64:Release', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_2016:x64:Release', 'Windows_2016:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug']
|
||||||
|
|
||||||
def static getBuildJobName(def configuration, def os) {
|
def static getBuildJobName(def configuration, def os, def architecture) {
|
||||||
return configuration.toLowerCase() + '_' + os.toLowerCase()
|
return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase()
|
||||||
}
|
}
|
||||||
|
|
||||||
[true, false].each { isPR ->
|
|
||||||
['Debug', 'Release'].each { configuration ->
|
|
||||||
osList.each { os ->
|
|
||||||
// Calculate names
|
|
||||||
def lowerConfiguration = configuration.toLowerCase()
|
|
||||||
|
|
||||||
// Calculate job name
|
platformList.each { platform ->
|
||||||
def jobName = getBuildJobName(configuration, os)
|
// Calculate names
|
||||||
def buildCommand = '';
|
def (os, architecture, configuration) = platform.tokenize(':')
|
||||||
|
|
||||||
// Calculate the build command
|
// Calculate job name
|
||||||
if (os == 'Windows_NT') {
|
def jobName = getBuildJobName(configuration, os, architecture)
|
||||||
buildCommand = ".\\build.cmd -Configuration ${lowerConfiguration} -Targets Default"
|
def buildCommand = '';
|
||||||
}
|
|
||||||
else if (os == 'Windows_2016') {
|
// Calculate the build command
|
||||||
buildCommand = ".\\build.cmd -Configuration ${lowerConfiguration} -RunInstallerTestsInDocker -Targets Default"
|
if (os == 'Windows_NT') {
|
||||||
}
|
buildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -Targets Default"
|
||||||
else if (os == 'Ubuntu') {
|
}
|
||||||
buildCommand = "./build.sh --skip-prereqs --configuration ${lowerConfiguration} --docker ubuntu --targets Default"
|
else if (os == 'Windows_2016') {
|
||||||
|
buildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -RunInstallerTestsInDocker -Targets Default"
|
||||||
|
}
|
||||||
|
else if (os == 'Ubuntu') {
|
||||||
|
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu --targets Default"
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// Jenkins non-Ubuntu CI machines don't have docker
|
||||||
|
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default"
|
||||||
|
}
|
||||||
|
|
||||||
|
def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
|
||||||
|
// Set the label.
|
||||||
|
steps {
|
||||||
|
if (os == 'Windows_NT' || os == 'Windows_2016') {
|
||||||
|
// Batch
|
||||||
|
batchFile(buildCommand)
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// Jenkins non-Ubuntu CI machines don't have docker
|
// Shell
|
||||||
buildCommand = "./build.sh --skip-prereqs --configuration ${lowerConfiguration} --targets Default"
|
shell(buildCommand)
|
||||||
}
|
|
||||||
|
|
||||||
def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
|
|
||||||
// Set the label.
|
|
||||||
steps {
|
|
||||||
if (os == 'Windows_NT' || os == 'Windows_2016') {
|
|
||||||
// Batch
|
|
||||||
batchFile(buildCommand)
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// Shell
|
|
||||||
shell(buildCommand)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Utilities.setMachineAffinity(newJob, os, 'latest-or-auto')
|
|
||||||
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
|
|
||||||
Utilities.addXUnitDotNETResults(newJob, '**/*-testResults.xml')
|
|
||||||
if (isPR) {
|
|
||||||
Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${configuration} Build")
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
Utilities.addGithubPushTrigger(newJob)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Utilities.setMachineAffinity(newJob, os, 'latest-or-auto')
|
||||||
|
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
|
||||||
|
Utilities.addXUnitDotNETResults(newJob, '**/*-testResults.xml')
|
||||||
|
Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ current_os()
|
||||||
elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then
|
elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then
|
||||||
echo "centos"
|
echo "centos"
|
||||||
elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then
|
elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then
|
||||||
echo "rhel.7"
|
echo "rhel"
|
||||||
elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then
|
elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then
|
||||||
echo "debian"
|
echo "debian"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue