commit 2ee92f8a0352c4661b2eca946a9d678d82194096
author Jon Hall <jhall@ciena.com> Thu Jun 07 13:07:33 2018 -0700
committer Jon Hall <jhall@ciena.com> Fri Jun 08 14:42:08 2018 -0700
tree 04c3b3ee5b65e015de9c0f9ea14f3d1deded6e4e
parent deabeba52c4902197353f0399dda29aa3c3ddd34

Add Fabric HA tests to Jenkins

Change-Id: Id48bb961e24b18c65d7542b2744d567bb06c60f8

TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy

diff --git a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
index 9cf5e7b..7a0fd9a 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
@@ -38,6 +38,7 @@
     testMachine = "TestStation-" + machine + "s"
     this.machine = machine
     isSCPF = false
+    hasArgs = false
     isTrend = true
 }
 
@@ -49,6 +50,7 @@
     init( type )
     SCPFfunc = SCPFfuncs
     isSCPF = true
+    hasArgs = true // Has TestON cli arguments to be added when running the test
     machine = machineType[ type ]
 }
 
@@ -63,6 +65,7 @@
     trend_generator_file = fileRelated.trendMultiple
     build_stats_generator_file = fileRelated.histogramMultiple
     isSCPF = false
+    hasArgs = false
 }
 
 def init( type ){
@@ -188,10 +191,10 @@
         timeout 240 stc teardown | head -100
         timeout 240 stc shutdown | head -100
         cd ~/OnosSystemTest/TestON/bin
-        git log |head
+        git log | head
         ./cleanup.sh -f
         ''' + "./cli.py run " +
-           ( !isSCPF ? testName : testCategory[ testName ][ 'test' ] ) +
+           ( !hasArgs ? testName : testCategory[ testName ][ 'test' ] ) +
            " --params GRAPH/nodeCluster=" + machineType[ testType ] + '''
         ./cleanup.sh -f
         # cleanup config changes
@@ -367,7 +370,7 @@
     // prop : dictionary property on the machine
     // pureTestName : Pure name of the test. ( ex. pureTestName of SCPFflowTpFobj will be SCPFflowTp )
     // graphOnly : check if it is generating graph job. If so, it will only generate the generating graph part
-    // testCategory : category of the test ( SCPF, SR, FUNC ... )
+    // testCategory : Map for the test suit ( SCPF, SR, FUNC, ... ) which contains information about the tests
     // graph_generator_file : Rscript file with the full path.
     // graph_saved_directory : where the generated graph will be saved to.