commit bb3001f508ee53d824f63db574ca105c3c462124
author Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Mon Jul 01 12:57:07 2019 -0700
committer Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Mon Jul 01 12:58:43 2019 -0700
tree 53056fbfb8e7ed9be393ee007d393cb0d533712f
parent fdc739c124e7f776699245f655adb2297b25507a

Fix for generating wiki graph test results

Change-Id: I5c67bb8010d504f7afcd7ac3d7ed7809441cdcca

TestON/JenkinsFile/CommonJenkinsFile.groovy

diff --git a/TestON/JenkinsFile/CommonJenkinsFile.groovy b/TestON/JenkinsFile/CommonJenkinsFile.groovy
index 978819a..9ac5bc0 100644
--- a/TestON/JenkinsFile/CommonJenkinsFile.groovy
+++ b/TestON/JenkinsFile/CommonJenkinsFile.groovy
@@ -39,6 +39,8 @@
 def main(){
     init()
     runTests()
+    generateGraphs()
+    sendToSlack()
 }
 
 def init(){
@@ -85,6 +87,8 @@
         graphPaths.put( "saveDirectory", fileRelated.jenkinsWorkspace + "postjob-Fabric" + funcs.fabricOn( prop[ "ONOSBranch" ] ) + "/" )
     } else if ( category == "SRHA" ) {
         graphPaths.put( "saveDirectory", fileRelated.jenkinsWorkspace + "postjob-Fabric" + "/" )
+    } else if ( category == "SCPF" || category == "USECASE" ){
+        graphPaths.put( "saveDirectory", fileRelated.jenkinsWorkspace + "postjob-BM/" )
     } else {
         graphPaths.put( "saveDirectory", fileRelated.jenkinsWorkspace + "postjob-VM/" )
     }
@@ -110,8 +114,19 @@
 }
 
 def generateGraphs(){
-    // generate the overall graph of the FUNC tests.
-    funcs.generateOverallGraph( prop, testsToRunStrList, graphPaths[ "saveDirectory" ] )
+    if ( category == "SCPF" ){
+        jobToRun = "manual-graph-generator-SCPF"
+        ONOSbranchParam = [ $class: 'StringParameterValue', name: 'ONOSbranch', value: test_list.addPrefixToBranch( branch ) ]
+        isOldFlowParam = [ $class: 'BooleanParameterValue', name: 'isOldFlow', value: true ]
+        // leaving Test param empty to use default values
+        build job: jobToRun, propagate: false, parameters: [ ONOSbranchParam, isOldFlowParam ]
+
+        isOldFlowParam = [ $class: 'BooleanParameterValue', name: 'isOldFlow', value: false ]
+        build job: jobToRun, propagate: false, parameters: [ ONOSbranchParam, isOldFlowParam ]
+    } else {
+        // generate the overall graph of the FUNC tests.
+        funcs.generateOverallGraph( prop, testsToRunStrList, graphPaths[ "saveDirectory" ] )
+    }
 }
 
 def sendToSlack(){

TestON/JenkinsFile/SCPF_Graph_Generator

diff --git a/TestON/JenkinsFile/SCPF_Graph_Generator b/TestON/JenkinsFile/SCPF_Graph_Generator
index 8e3abb8..404da74 100644
--- a/TestON/JenkinsFile/SCPF_Graph_Generator
+++ b/TestON/JenkinsFile/SCPF_Graph_Generator
@@ -27,7 +27,7 @@
 funcs.initialize( "SCPF", SCPFfuncs );
 
 def prop = null
-prop = funcs.getProperties( "SCPF" )
+prop = funcs.getProperties( "SCPF", params.ONOSbranch )
 
 // get the variables from the Jenkins parameters.
 def Tests = params.Test