diff --git a/Jenkinsfile b/Jenkinsfile index 37b16fc4919aebc6ba393851975bc5dc2b475f2f..8f9e81bdd121bb65f12ea132a79f398f3bd2ed75 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,8 @@ def failFast = false properties([buildDiscarder(logRotator(numToKeepStr: '50', artifactNumToKeepStr: '3')), durabilityHint('PERFORMANCE_OPTIMIZED')]) -def buildTypes = ['Linux', 'Windows'] +// TODO: Restore 'Windows' once https://groups.google.com/forum/#!topic/jenkinsci-dev/v9d-XosOp2s is resolved +def buildTypes = ['Linux'] def jdks = [8, 11] def builds = [:] @@ -74,7 +75,9 @@ 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 @@ -96,7 +99,7 @@ builds.ath = { runATH jenkins: fileUri, metadataFile: metadataPath } } -} +}*/ builds.failFast = failFast parallel builds diff --git a/test/src/test/java/benchmarks/BenchmarkTest.java b/test/src/test/java/benchmarks/BenchmarkTest.java index 4ad697203aed06c2dbb255aeda908ba4cee774f3..5e490542c7eb8e0009837aacce025c61706e20b5 100644 --- a/test/src/test/java/benchmarks/BenchmarkTest.java +++ b/test/src/test/java/benchmarks/BenchmarkTest.java @@ -11,10 +11,7 @@ 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 { /** @@ -28,8 +25,6 @@ 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)