commit ccd4bc1e7453f3c2a40724b2be9156ee14a4ffb5
author Devin Lim <devin@opennetworking.org> Mon Apr 09 18:11:25 2018 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Mon Apr 09 18:11:25 2018 +0000
tree 42de2ef7acb66fb14fd0389a13b6863f3f3dd545
parent 5df1c6df74f9bc0ed3da33e12d8563c47acc42d3
parent 981f80bcf243d2a092a046792b34b3b8c4373d1b

Merge "Fix the cluster name on SR tests"

TestON/JenkinsFile/JenkinsCommonFuncs.groovy

diff --git a/TestON/JenkinsFile/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
index 338f864..ae1f6ac 100644
--- a/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
@@ -8,6 +8,7 @@
   testMachine = "TestStation-" + machine + "s";
   this.machine = machine
   isSCPF = false
+  isTrend = true
   generalFuncs.initBasicVars();
 }
 def initialize( type, SCPFfuncs ){
@@ -33,10 +34,12 @@
                   "USECASE" : "BM" ]
   testType = type;
   testMachine = "TestStation-" + machineType[ type ] + "s";
+  isTrend = false
   generalFuncs.initBasicVars();
 }
 def additionalInitForSR( branch ){
   testMachine = ( ( new StringBuilder( testMachine ) ).insert( testMachine.size()-1, fabricOn( branch ) ) ).toString()
+  ( isTrend ? machine : machineType[ testType ] ) += fabricOn(branch )
   print testMachine
 }
 def fabricOn( branch ){

TestON/JenkinsFile/Trend_Graph_Generator

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
+}