From 67cfa954c8fa9f4149b8e9934ba445fec9cfb88e Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Tue, 21 Dec 2021 06:50:01 -0800
Subject: [PATCH] Run tests on Windows (#6024)

---
 Jenkinsfile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4aeb3fd1487b..93d06f7155ec 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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') {