diff --git a/TestON/JenkinsFile/Trend_Graph_Generator b/TestON/JenkinsFile/Trend_Graph_Generator
index 4169cff..5f3ccfd 100644
--- a/TestON/JenkinsFile/Trend_Graph_Generator
+++ b/TestON/JenkinsFile/Trend_Graph_Generator
@@ -3,7 +3,8 @@
 nodeCluster = params.NodeCluster
 
 funcs.initializeTrend( nodeCluster );
-funcs.additionalInitForSR( params.ONOSbranch )
+if( nodeCluster == "Fabric" )
+  funcs.additionalInitForSR( params.ONOSbranch )
 def prop = null
 prop = funcs.getProperties()
 
@@ -12,7 +13,7 @@
 
 
 graph_generator_file = "~/OnosSystemTest/TestON/JenkinsFile/scripts/testCaseGraphGenerator.R"
-graph_saved_directory = "/var/jenkins/workspace/postjob-" + nodeCluster + funcs.fabricOn( prop[ "ONOSBranch" ] ) + "/"
+graph_saved_directory = "/var/jenkins/workspace/postjob-" + nodeCluster + ( nodeCluster == "Fabric" ? funcs.fabricOn( prop[ "ONOSBranch" ] ) : "" ) + "/"
 
 def testsToRun = null
 testsToRun = funcs.getTestsToRun( Tests )
@@ -25,4 +26,4 @@
 
 for ( test in tests.keySet() ){
     tests[ test ].call()
-}
\ No newline at end of file
+}