commit 62199e7874f4c18b4870e0a2889ea030f3f15a2b
author Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Tue Jul 02 14:24:31 2019 -0700
committer Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Tue Jul 02 14:36:08 2019 -0700
tree de6b8dad65ad42057778f3562679492f2ad602d6
parent 5066a3d96de4a5fff01a02e5a1e27da5ff771f80

Fix for SCPF Jenkins Automation

Change-Id: I7ebe882a7e4e1711f4da4525d60333a2205d1078

TestON/JenkinsFile/CommonJenkinsFile.groovy

diff --git a/TestON/JenkinsFile/CommonJenkinsFile.groovy b/TestON/JenkinsFile/CommonJenkinsFile.groovy
index b7e1f63..da75d4d 100644
--- a/TestON/JenkinsFile/CommonJenkinsFile.groovy
+++ b/TestON/JenkinsFile/CommonJenkinsFile.groovy
@@ -50,17 +50,16 @@
 
     if ( category == "SCPF" ){
         // SCPF needs to obtain properties earlier
-        funcs.initialize( "SCPF", SCPFfuncs )
+        funcs.initialize( category, SCPFfuncs );
         prop = funcs.getProperties( category, test_list.addPrefixToBranch( branch ) )
 
         SCPFfuncs.init()
         isOldFlow = prop[ "isOldFlow" ] == "true"
         SCPFfuncs.oldFlowRuleCheck( isOldFlow, prop[ "ONOSBranch" ] )
     } else if ( category == "SR" ){
+        funcs.initialize( category );
         // 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 ) )