commit 64eeeb13277f0882bfdf6766422b9a78bc2fa88e
author Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Mon May 13 11:19:46 2019 -0700
committer Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Mon May 20 16:27:31 2019 -0700
tree 4eaf640b68d2a95aecc6612afc240f7619837c45
parent d18335253c8f93b0c2f10f86186ebb94b6d2020a

[ONOS-7985]: Refactor list of tests used in TestON Jenkins Pipelines

Change-Id: Ic3d67fd0b0b0eb4a74f9f0c198dc5a868c5afa95

TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy

diff --git a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
index 68d75e9..d64f12e 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
@@ -26,8 +26,10 @@
 
 generalFuncs = evaluate readTrusted( 'TestON/JenkinsFile/dependencies/GeneralFuncs.groovy' )
 fileRelated = evaluate readTrusted( 'TestON/JenkinsFile/dependencies/JenkinsPathAndFiles.groovy' )
+test_list = evaluate readTrusted( 'TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy' )
 
 fileRelated.init()
+test_list.init()
 
 def initializeTrend( machine ){
     // For initializing any trend graph jobs
@@ -495,22 +497,6 @@
     }
 }
 
-def makeTestList( list, commaNeeded ){
-    // make the list of the test in to a string.
-    // list : list of the test
-    // commaNeeded : if comma is needed for the string
-
-    return generalFuncs.getTestList( list ) + ( commaNeeded ? "," : "" )
-}
-
-def createStatsList( testCategory, list, semiNeeded ){
-    // make the list for stats
-    // testCategory : category of the test
-    // list : list of the test
-    // semiNeeded: if semi colon is needed
-
-    return testCategory + "-" + generalFuncs.getTestList( list ) + ( semiNeeded ? ";" : "" )
-}
 
 def generateOverallGraph( prop, testCategory, graph_saved_directory ){
     // generate the overall graph for the test
@@ -567,18 +553,24 @@
     done '''
 }
 
-def generateStatGraph( testMachineOn, onos_branch, AllTheTests, stat_graph_generator_file, pie_graph_generator_file,
+def generateStatGraph( testMachineOn, onos_branch, stat_graph_generator_file, pie_graph_generator_file,
                        graph_saved_directory ){
-    // Will generate the stats graph.
 
-    testListPart = createStatsList( "FUNC", AllTheTests[ "FUNC" ], true ) +
-                   createStatsList( "HA", AllTheTests[ "HA" ], true ) +
-                   createStatsList( "USECASE", AllTheTests[ "USECASE" ], false )
-    pieTestList = makeTestList( AllTheTests[ "FUNC" ], true ) +
-                  makeTestList( AllTheTests[ "HA" ], true ) +
-                  makeTestList( AllTheTests[ "USECASE" ], false )
+    // Will generate the stats graph.
+    FUNCtestsStr = test_list.getTestListAsString( test_list.getTestsFromCategory( "FUNC" ) )
+    HAtestsStr = test_list.getTestListAsString( test_list.getTestsFromCategory( "HA" ) )
+    USECASEtestsStr = test_list.getTestListAsString( test_list.getTestsFromCategory( "USECASE" ) )
+
+    testListParam = "FUNC-"     + FUNCtestsStr + ";" +
+                    "HA-"       + HAtestsStr   + ";" +
+                    "USECASE-"  + USECASEtestsStr
+
+    pieTestListParam = FUNCtestsStr + "," +
+                       HAtestsStr   + "," +
+                       USECASEtestsStr
+
     generateCategoryStatsGraph( testMachineOn, "false", "true", stat_graph_generator_file, pie_graph_generator_file,
-                                "ALL", onos_branch, testListPart, graph_saved_directory, pieTestList )
+                                "ALL", onos_branch, testListParam, graph_saved_directory, pieTestListParam )
 }
 
 def branchWithPrefix( branch ){