[ONOS-7986]: Refactoring uses of TestON Jenkinsfile paths
Change-Id: I9f123db29de1178a4422116292b7c96b7317fad4
diff --git a/TestON/JenkinsFile/CHO_Graph_Generator b/TestON/JenkinsFile/CHO_Graph_Generator
index 26e7ca2..db65ce7 100644
--- a/TestON/JenkinsFile/CHO_Graph_Generator
+++ b/TestON/JenkinsFile/CHO_Graph_Generator
@@ -24,6 +24,7 @@
fileRelated = evaluate readTrusted( 'TestON/JenkinsFile/dependencies/JenkinsPathAndFiles.groovy' )
fileRelated.init()
+
// The way reading the parameters from the Jenkins.
branches = params.ONOSbranch
hours = params.hours
@@ -34,10 +35,11 @@
// initialize the directory.
// Script file is the R script path
-script_file = fileRelated.trendCHO
+script_file = fileRelated.rScriptPaths[ "scripts" ][ "trendCHO" ]
+
// saving_directory is the directory that save the generate graphs.
-saving_directory = fileRelated.jenkinsWorkspace + "postjob-Fabric5/"
-scriptDir = fileRelated.CHOScriptDir
+saving_directory = fileRelated.workspaces[ "Fabric5" ]
+scriptDir = fileRelated.rScriptPaths[ "directories" ][ "CHO" ]
// create a bash script that will generate the graph
graphScript = generateGraphScript( branchList )
@@ -54,7 +56,7 @@
postJob()
}
-saving_directory = fileRelated.jenkinsWorkspace + "postjob-Trellis-POD/"
+saving_directory = fileRelated.workspaces[ "Trellis" ]
graphScript = generateGraphScript( branchList )
stage( 'Generating-Graph-POD' ) {
// This will run on TestStation-Trellis-POD node.