Minor fix to All Pipeline Trigger running non-master ONOS branch
Change-Id: I8f48ffc803e8d7d2bb9a2a82e5a15ecd786ed523
diff --git a/TestON/JenkinsFile/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
index f8d162b..f9af19a 100644
--- a/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/JenkinsCommonFuncs.groovy
@@ -339,5 +339,7 @@
makeTestList( AllTheTests[ "USECASE" ], false )
generateCategoryStatsGraph( "false", "true", stat_graph_generator_file, pie_graph_generator_file, "ALL", onos_branch, testListPart, graph_saved_directory, pieTestList )
}
-
+def branchWithPrefix( branch ){
+ return ( ( branch != "master" ) ? "onos-" : "" ) + branch
+}
return this;
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 )