Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Removed duplicated timeouts.

Browse Source
This commit is contained in:
/dev/root 2017-05-31 23:19:22 +02:00
parent 7805d7f356
commit ec26e36f54
1 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Jenkinsfile vendored
View File

@ -123,7 +123,7 @@ def doUnitTests(name) {
def localization = readFile("${tool "Modern Warfare 2"}/localization.txt").split("\r?\n")[0] def localization = readFile("${tool "Modern Warfare 2"}/localization.txt").split("\r?\n")[0]
try { try {
timeout(time: 180, unit: "MINUTES") { timeout(time: 10, unit: "MINUTES") {
// Set up environment // Set up environment
if (isUnix()) { if (isUnix()) {
def mw2dir = tool "Modern Warfare 2" def mw2dir = tool "Modern Warfare 2"
@ -241,8 +241,6 @@ gitlabBuilds(builds: ["Checkout & Versioning", "Build", "Testing", "Archiving"])
stage("Testing") { stage("Testing") {
gitlabCommitStatus("Testing") { gitlabCommitStatus("Testing") {
executions = [:] executions = [:]
try {
timeout(10) {
for (int i = 0; i < testing.size(); i++) { for (int i = 0; i < testing.size(); i++) {
def entry = testing.get(i) def entry = testing.get(i)
@ -269,24 +267,12 @@ gitlabBuilds(builds: ["Checkout & Versioning", "Build", "Testing", "Archiving"])
image.inside { image.inside {
doUnitTests(test.StashName) doUnitTests(test.StashName)
} }
} catch (Exception e) {
if (isUnix()) {
manager.buildUnstable()
manager.addWarningBadge "$testName unit test failed on Linux"
} else {
throw e
}
}
} }
} }
} }
} }
parallel executions parallel executions
} }
} catch (Exception e) {
manager.buildUnstable()
manager.addWarningBadge "Tests ran too long."
}
} }
} }