Skip to content

Commit 84ca40e

Browse files
committed
Run tests on Windows
1 parent b81428f commit 84ca40e

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

Jenkinsfile

+9-3
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,24 @@ properties([
1818
disableConcurrentBuilds(abortPrevious: true)
1919
])
2020

21-
// TODO: Restore 'Windows' once https://groups.google.com/forum/#!topic/jenkinsci-dev/v9d-XosOp2s is resolved
22-
def buildTypes = ['Linux']
21+
def buildTypes = ['Linux', 'Windows']
2322
def jdks = [8, 11]
2423

2524
def builds = [:]
2625
for(i = 0; i < buildTypes.size(); i++) {
2726
for(j = 0; j < jdks.size(); j++) {
2827
def buildType = buildTypes[i]
2928
def jdk = jdks[j]
29+
if (buildType == 'Windows' && jdk == 8) {
30+
continue // unnecessary use of hardware
31+
}
3032
builds["${buildType}-jdk${jdk}"] = {
3133
// see https://github.com/jenkins-infra/documentation/blob/master/ci.adoc#node-labels for information on what node types are available
32-
node(buildType == 'Linux' ? (jdk == 8 ? 'maven' : 'maven-11') : buildType.toLowerCase()) {
34+
String agentContainerLabel = jdk == 8 ? 'maven' : 'maven-11'
35+
if (buildType == 'Windows') {
36+
agentContainerLabel += '-windows'
37+
}
38+
node(agentContainerLabel) {
3339
// First stage is actually checking out the source. Since we're using Multibranch
3440
// currently, we can use "checkout scm".
3541
stage('Checkout') {

0 commit comments

Comments
 (0)