Initialization fix for SCPF tests in Jenkins Pipelines
Change-Id: I053d34c64df549f922bbe35406a39d5595824718
diff --git a/TestON/JenkinsFile/CommonJenkinsFile.groovy b/TestON/JenkinsFile/CommonJenkinsFile.groovy
index 9ac5bc0..28e0f4b 100644
--- a/TestON/JenkinsFile/CommonJenkinsFile.groovy
+++ b/TestON/JenkinsFile/CommonJenkinsFile.groovy
@@ -48,22 +48,24 @@
test_list.init()
readParams()
- funcs.initialize( category );
-
if ( category == "SCPF" ){
// SCPF needs to obtain properties earlier
prop = funcs.getProperties( category, test_list.addPrefixToBranch( branch ) )
+ funcs.initialize( "SCPF", SCPFfuncs )
+
SCPFfuncs.init()
isOldFlow = prop[ "isOldFlow" ] == "true"
SCPFfuncs.oldFlowRuleCheck( isOldFlow, prop[ "ONOSBranch" ] )
} else if ( category == "SR" ){
// get the name of the Jenkins job.
jobName = env.JOB_NAME
+ funcs.initialize( category );
// additional setup for Segment routing because it is running multiple branch concurrently on different machines.
funcs.additionalInitForSR( jobName )
prop = funcs.getProperties( category, test_list.addPrefixToBranch( branch ) )
} else {
+ funcs.initialize( category );
prop = funcs.getProperties( category, test_list.addPrefixToBranch( branch ) )
}