Test Pipelines read timeout param earlier
Change-Id: I1176bcdd09f6a50d1102c122df0782f123ff4b68
diff --git a/TestON/JenkinsFile/CommonJenkinsFile.groovy b/TestON/JenkinsFile/CommonJenkinsFile.groovy
index 33ed5d1..ae8c2bc 100644
--- a/TestON/JenkinsFile/CommonJenkinsFile.groovy
+++ b/TestON/JenkinsFile/CommonJenkinsFile.groovy
@@ -27,8 +27,6 @@
fileRelated = evaluate readTrusted( 'TestON/JenkinsFile/dependencies/JenkinsPathAndFiles.groovy' )
SCPFfuncs = evaluate readTrusted( 'TestON/JenkinsFile/dependencies/PerformanceFuncs.groovy' )
-INITIALIZATION_TIMEOUT_MINUTES = 10 // timeout init() function if it takes too long.
-
category = null
prop = null
testsToRun = null
@@ -50,10 +48,9 @@
main()
def main(){
- timeout( time: INITIALIZATION_TIMEOUT_MINUTES, unit: "MINUTES" ){
- init()
- }
+ pipelineTimeout = params.TimeOut.toInteger() // integer minutes until the entire pipeline times out. Usually passed from upstream master-trigger job.
timeout( time: pipelineTimeout, unit: "MINUTES" ){
+ init()
runTests()
generateGraphs()
sendToSlack()
@@ -100,7 +97,6 @@
nodeLabel = params.NodeLabel // "BM", "VM", "Fabric-1.x", etc.
testsOverride = params.TestsOverride // "FUNCflow, FUNCintent, [...]", overrides property file
isGraphOnly = params.OnlyRefreshGraphs // true or false
- pipelineTimeout = params.TimeOut.toInteger() // integer minutes until the entire pipeline times out. Usually passed from upstream master-trigger job.
}
def getProperties(){