mirror of https://github.com/jenkinsci/jenkins.git
Run tests on Windows (#6024)
This commit is contained in:
parent
1ce5adfccb
commit
67cfa954c8
|
@ -18,8 +18,7 @@ properties([
|
|||
disableConcurrentBuilds(abortPrevious: true)
|
||||
])
|
||||
|
||||
// TODO: Restore 'Windows' once https://groups.google.com/forum/#!topic/jenkinsci-dev/v9d-XosOp2s is resolved
|
||||
def buildTypes = ['Linux']
|
||||
def buildTypes = ['Linux', 'Windows']
|
||||
def jdks = [8, 11]
|
||||
|
||||
def builds = [:]
|
||||
|
@ -27,9 +26,16 @@ for(i = 0; i < buildTypes.size(); i++) {
|
|||
for(j = 0; j < jdks.size(); j++) {
|
||||
def buildType = buildTypes[i]
|
||||
def jdk = jdks[j]
|
||||
if (buildType == 'Windows' && jdk == 8) {
|
||||
continue // unnecessary use of hardware
|
||||
}
|
||||
builds["${buildType}-jdk${jdk}"] = {
|
||||
// see https://github.com/jenkins-infra/documentation/blob/master/ci.adoc#node-labels for information on what node types are available
|
||||
node(buildType == 'Linux' ? (jdk == 8 ? 'maven' : 'maven-11') : buildType.toLowerCase()) {
|
||||
String agentContainerLabel = jdk == 8 ? 'maven' : 'maven-11'
|
||||
if (buildType == 'Windows') {
|
||||
agentContainerLabel += '-windows'
|
||||
}
|
||||
node(agentContainerLabel) {
|
||||
// First stage is actually checking out the source. Since we're using Multibranch
|
||||
// currently, we can use "checkout scm".
|
||||
stage('Checkout') {
|
||||
|
|
Loading…
Reference in New Issue