Revert "Disable Windows builds and ATH to mitigate the ongoing INFRA issue" (#4155)

* Revert "Disable Windows builds, ATH and Incrementals to mitigate the ongoing INFRA issue (#4153)"

This reverts commit 33563113.

* Jenkinsfile: Prepare to Windows Docker agents

* Revert the Linux label patch for the ATH step

* Disable Benchmarks for Windows

Jenkinsfile

@@ -11,8 +11,7 @@ def failFast = false
 
 properties([buildDiscarder(logRotator(numToKeepStr: '50', artifactNumToKeepStr: '3')), durabilityHint('PERFORMANCE_OPTIMIZED')])
 
-// 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 = [:]
@@ -73,9 +72,7 @@ for(j = 0; j < jdks.size(); j++) {
     }
 }}
 
-// TODO: Restore ATH once https://groups.google.com/forum/#!topic/jenkinsci-dev/v9d-XosOp2s is resolved
 // TODO: ATH flow now supports Java 8 only, it needs to be reworked (INFRA-1690)
-/*
 builds.ath = {
     node("docker&&highmem") {
         // Just to be safe
@@ -97,7 +94,7 @@ builds.ath = {
             runATH jenkins: fileUri, metadataFile: metadataPath
         }
     }
-}*/
+}
 
 builds.failFast = failFast
 parallel builds

test/src/test/java/benchmarks/BenchmarkTest.java

@@ -11,7 +11,10 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
 
+import hudson.Functions;
+
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 
 public class BenchmarkTest {
     /**
@@ -25,6 +28,8 @@ public class BenchmarkTest {
      */
     @Test
     public void runSampleBenchmark() throws Exception {
+        assumeFalse(Functions.isWindows());
+        
         // run the minimum possible number of iterations
         ChainedOptionsBuilder options = new OptionsBuilder()
                                             .mode(Mode.AverageTime)