Removed duplicated timeouts.
This commit is contained in:
parent
7805d7f356
commit
ec26e36f54
16
Jenkinsfile
vendored
16
Jenkinsfile
vendored
@ -123,7 +123,7 @@ def doUnitTests(name) {
|
||||
def localization = readFile("${tool "Modern Warfare 2"}/localization.txt").split("\r?\n")[0]
|
||||
|
||||
try {
|
||||
timeout(time: 180, unit: "MINUTES") {
|
||||
timeout(time: 10, unit: "MINUTES") {
|
||||
// Set up environment
|
||||
if (isUnix()) {
|
||||
def mw2dir = tool "Modern Warfare 2"
|
||||
@ -241,8 +241,6 @@ gitlabBuilds(builds: ["Checkout & Versioning", "Build", "Testing", "Archiving"])
|
||||
stage("Testing") {
|
||||
gitlabCommitStatus("Testing") {
|
||||
executions = [:]
|
||||
try {
|
||||
timeout(10) {
|
||||
for (int i = 0; i < testing.size(); i++) {
|
||||
def entry = testing.get(i)
|
||||
|
||||
@ -269,24 +267,12 @@ gitlabBuilds(builds: ["Checkout & Versioning", "Build", "Testing", "Archiving"])
|
||||
image.inside {
|
||||
doUnitTests(test.StashName)
|
||||
}
|
||||
} catch (Exception e) {
|
||||
if (isUnix()) {
|
||||
manager.buildUnstable()
|
||||
manager.addWarningBadge "$testName unit test failed on Linux"
|
||||
} else {
|
||||
throw e
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
parallel executions
|
||||
}
|
||||
} catch (Exception e) {
|
||||
manager.buildUnstable()
|
||||
manager.addWarningBadge "Tests ran too long."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user