commit f78a6ca460053d0e235ab9afc449b89149048122
author Jeremy Ronquillo <jeremyr@opennetworking.org> Mon Mar 12 09:20:57 2018 -0700
committer Jeremy Ronquillo <jeremyr@opennetworking.org> Mon Mar 12 17:11:30 2018 +0000
tree 06d13061888fd7af0b578b69929515fb30b819a4
parent cdd177d0dcbab942fae5e350ce0afd9b8b131e67

Minor fix to All Pipeline Trigger running non-master ONOS branch

Change-Id: I8f48ffc803e8d7d2bb9a2a82e5a15ecd786ed523

TestON/JenkinsFile/JenkinsfileTrigger

diff --git a/TestON/JenkinsFile/JenkinsfileTrigger b/TestON/JenkinsFile/JenkinsfileTrigger
index 84fa15e..d947b24 100644
--- a/TestON/JenkinsFile/JenkinsfileTrigger
+++ b/TestON/JenkinsFile/JenkinsfileTrigger
@@ -104,7 +104,11 @@
 //finalList[ "BM" ].call()
 
 if ( !manually_run ){
-    funcs.generateStatGraph( onos_b, AllTheTests, stat_graph_generator_file, pie_graph_generator_file, graph_saved_directory )
+    funcs.generateStatGraph( funcs.branchWithPrefix( onos_b ),
+                             AllTheTests,
+                             stat_graph_generator_file,
+                             pie_graph_generator_file,
+                             graph_saved_directory )
 }
 
 def testDivider( today ){
@@ -300,9 +304,7 @@
 def trigger( branch, tests, nodeName, jobOn, manuallyRun, onosTag ){
     println jobOn + "-pipeline-" + manuallyRun ? "manually" : branch
     wiki = branch
-    if ( branch != "master" ){
-        branch = "onos-" + branch
-    }
+    branch = funcs.branchWithPrefix( branch )
     test_branch = "master"
     node( "TestStation-" + nodeName + "s" ){
         envSetup( branch, test_branch, onosTag, jobOn, manuallyRun )