Skip to content

Commit 0ea06ba

Browse files
committed
Run tests on Windows
1 parent 845255a commit 0ea06ba

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Jenkinsfile

+6-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ 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 = [:]
@@ -29,7 +28,11 @@ for(j = 0; j < jdks.size(); j++) {
2928
def jdk = jdks[j]
3029
builds["${buildType}-jdk${jdk}"] = {
3130
// 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()) {
31+
String agentContainerLabel = jdk == 8 ? 'maven' : 'maven-11'
32+
if (buildType == 'Windows') {
33+
agentContainerLabel += '-windows'
34+
}
35+
node(agentContainerLabel) {
3336
// First stage is actually checking out the source. Since we're using Multibranch
3437
// currently, we can use "checkout scm".
3538
stage('Checkout') {
@@ -109,7 +112,6 @@ for(j = 0; j < jdks.size(); j++) {
109112
}
110113
}}
111114

112-
// TODO: Restore ATH once https://groups.google.com/forum/#!topic/jenkinsci-dev/v9d-XosOp2s is resolved
113115
// TODO: ATH flow now supports Java 8 only, it needs to be reworked (INFRA-1690)
114116
builds.ath = {
115117
node("docker-highmem") {

0 commit comments

Comments
 (0)