commit 1bd814f25a743391e20a96e3045eb7a96c851f87
author Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Wed Jul 31 14:45:04 2019 -0700
committer Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Wed Jul 31 14:45:04 2019 -0700
tree faabb4c17a04b3b7a49a08c2d51773ef356ca24f
parent b8aac4404c1a43dc08c6a795b45f8a5cc7966b3b

Fix images in individual SR test wiki results

Change-Id: I6c9fc8ed0942320124b3c13662a46a459ecf4a49

TestON/JenkinsFile/CommonJenkinsFile.groovy

diff --git a/TestON/JenkinsFile/CommonJenkinsFile.groovy b/TestON/JenkinsFile/CommonJenkinsFile.groovy
index ac60785..cd39c75 100644
--- a/TestON/JenkinsFile/CommonJenkinsFile.groovy
+++ b/TestON/JenkinsFile/CommonJenkinsFile.groovy
@@ -190,7 +190,7 @@
     return '''cd ~/OnosSystemTest/TestON/bin
            ./cli.py run ''' +
            testName +
-           ''' --params GRAPH/nodeCluster=''' + nodeLabel
+           ''' --params GRAPH/nodeCluster=''' + graphs.getPostjobType( nodeLabel )
 }
 
 def concludeRunTest(){

TestON/JenkinsFile/dependencies/JenkinsGraphs.groovy

diff --git a/TestON/JenkinsFile/dependencies/JenkinsGraphs.groovy b/TestON/JenkinsFile/dependencies/JenkinsGraphs.groovy
index 974ab5f..8fccede 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsGraphs.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsGraphs.groovy
@@ -37,28 +37,30 @@
     build_stats_generator_file = fileRelated.rScriptPaths[ "scripts" ][ "histogramMultiple" ]
 }
 
+def getPostjobType( nodeL ){
+    switch ( nodeL ){
+        case "Fabric-1.x":
+            return "Fabric2"
+            break
+        case "Fabric-2.x":
+            return "Fabric3"
+            break
+        case "Fabric-master":
+            return "Fabric4"
+            break
+        default:
+            return nodeL
+            break
+    }
+}
+
 def postResult( prop, graphOnly, nodeLabel ){
     // post the result by triggering postjob.
     // prop : property dictionary that was read from the machine.
     // graphOnly : if it is graph generating job
 
     if ( graphOnly || isPostingResult( prop[ "manualRun" ], prop[ "postResult" ] ) ){
-        postjob_type = ""
-        switch ( nodeLabel ){
-            case "Fabric-1.x":
-                postjob_type = "Fabric2"
-                break
-            case "Fabric-2.x":
-                postjob_type = "Fabric3"
-                break
-            case "Fabric-master":
-                postjob_type = "Fabric4"
-                break
-            default:
-                postjob_type = nodeLabel
-                break
-        }
-
+        postjob_type = getPostjobType( nodeLabel )
         def post = build job: "postjob-" + postjob_type, propagate: false
     }
 }