未验证 提交 9225492a 编写于 作者: O Oleg Nenashev 提交者: GitHub

Revert "Revert "Disable Windows builds and ATH to mitigate the ongoing INFRA...

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

This reverts commit e37cd74f.
上级 e084ac66
......@@ -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
......
......@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册