commit 6fbfdd5dce3f77546f2f233e8d5dd3b2a0d51e3c
author Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Tue Jul 09 13:49:34 2019 -0700
committer Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Thu Jul 11 18:20:23 2019 +0000
tree 3ecd062722b36b9462e6ceea2bd49cb91b6a3d51
parent 069509930a86131a460e2b7bd743878885994ec4

[ONOS-8015]: Utilize node labels in Jenkins pipelines

Change-Id: I6599f0f1fea4199a31fb2fbca10ef64188c07de1

TestON/JenkinsFile/CommonJenkinsFile.groovy

diff --git a/TestON/JenkinsFile/CommonJenkinsFile.groovy b/TestON/JenkinsFile/CommonJenkinsFile.groovy
index 4081499..d60df2e 100644
--- a/TestON/JenkinsFile/CommonJenkinsFile.groovy
+++ b/TestON/JenkinsFile/CommonJenkinsFile.groovy
@@ -30,6 +30,7 @@
 testsToRunStrList = null
 branch = null
 start = null
+testStation = null
 testsFromList = [:]
 graphPaths = [:]
 pipeline = [:]
@@ -50,21 +51,19 @@
 
     if ( category == "SCPF" ){
         // SCPF needs to obtain properties earlier
-        funcs.initialize( category, SCPFfuncs );
+        funcs.initialize( category, testStation, nodeLabel, 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 );
+        funcs.initialize( category, testStation, nodeLabel );
         // get the name of the Jenkins job.
         jobName = env.JOB_NAME
-        // 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 );
+        funcs.initialize( category, testStation, nodeLabel );
         prop = funcs.getProperties( category, test_list.addPrefixToBranch( branch ) )
     }
 
@@ -78,8 +77,10 @@
 }
 
 def readParams(){
-    category = params.Category // "FUNC", "HA", "USECASE", etc.
-    branch = params.Branch
+    category = params.Category       // "FUNC", "HA", "USECASE", etc.
+    branch = params.Branch           // "1.15", "2.1", "master", etc.
+    testStation = params.TestStation // "TestStation-BMs", etc.
+    nodeLabel = params.NodeLabel     // "BM", "VM", "Fabric-1.x", etc.
 }
 
 def initGraphPaths(){