commit 5b22fbbce947a67c26f98affc589c57e1e67a19f
author Devin Lim <devin@opennetworking.org> Fri Apr 06 15:30:45 2018 -0700
committer Devin Lim <devin@opennetworking.org> Fri Apr 06 17:45:41 2018 -0700
tree 465b8d956ea401bc88f0dd6a27ad56d5a4f599c0
parent d6b03d2f95b1757672244b16488c8195e8f0855f

[ONOS-7590] ver.c

Change-Id: I5836ac20650cd3b15debdee79fa2473409bc10df

TestON/JenkinsFile/SRJenkinsFile

diff --git a/TestON/JenkinsFile/SRJenkinsFile b/TestON/JenkinsFile/SRJenkinsFile
index 45cb315..ac9a147 100644
--- a/TestON/JenkinsFile/SRJenkinsFile
+++ b/TestON/JenkinsFile/SRJenkinsFile
@@ -3,10 +3,11 @@
 test_lists = evaluate readTrusted( 'TestON/JenkinsFile/JenkinsTestONTests.groovy' )
 
 funcs.initialize( "SR" );
+jobName = ${env.JOB_NAME}
+funcs.additionalInitForSR( jobName.reverse().take(6).reverse() )
 // This is a Jenkinsfile for a scripted pipeline for the SR tests
 def prop = null
 prop = funcs.getProperties()
-funcs.additionalInitForSR( prop[ "ONOSBranch" ] )
 SR = test_lists.getAllTheTests( prop[ "WikiPrefix" ] )[ "SR" ]
 
 graph_generator_file = "~/OnosSystemTest/TestON/JenkinsFile/scripts/testCaseGraphGenerator.R"

TestON/JenkinsFile/Trend_Graph_Generator

diff --git a/TestON/JenkinsFile/Trend_Graph_Generator b/TestON/JenkinsFile/Trend_Graph_Generator
index f091c34..4169cff 100644
--- a/TestON/JenkinsFile/Trend_Graph_Generator
+++ b/TestON/JenkinsFile/Trend_Graph_Generator
@@ -3,13 +3,13 @@
 nodeCluster = params.NodeCluster
 
 funcs.initializeTrend( nodeCluster );
+funcs.additionalInitForSR( params.ONOSbranch )
 def prop = null
 prop = funcs.getProperties()
 
 def Tests = params.Test
 prop[ "ONOSBranch" ] = params.ONOSbranch
 
-funcs.additionalInitForSR( prop[ "ONOSBranch" ] )
 
 graph_generator_file = "~/OnosSystemTest/TestON/JenkinsFile/scripts/testCaseGraphGenerator.R"
 graph_saved_directory = "/var/jenkins/workspace/postjob-" + nodeCluster + funcs.fabricOn( prop[ "ONOSBranch" ] ) + "/"

TestON/JenkinsFile/TriggerFuncs.groovy

diff --git a/TestON/JenkinsFile/TriggerFuncs.groovy b/TestON/JenkinsFile/TriggerFuncs.groovy
index cf9f6fc..b42236d 100644
--- a/TestON/JenkinsFile/TriggerFuncs.groovy
+++ b/TestON/JenkinsFile/TriggerFuncs.groovy
@@ -67,12 +67,7 @@
 // nodeName : "BM" or "VM"
 // jobOn : "SCPF" or "USECASE" or "FUNC" or "HA"
     return{
-        if( jobOn == "SR" ){
-            trigger( "1.12", tests, nodeName, jobOn, manuallyRun, onosTag )
-            trigger( "master", tests, nodeName, jobOn, manuallyRun, onosTag )
-            }else{
-            trigger( branch, tests, nodeName, jobOn, manuallyRun, onosTag )
-        }
+        trigger( branch, tests, nodeName, jobOn, manuallyRun, onosTag )
     }
 }
 // export Environment properties.