[ONOS-7756] More fixes for jenkins triggers
Change-Id: Ie2e292266b4c84ff8116de5670afa71014bd9d29
diff --git a/TestON/JenkinsFile/dependencies/TriggerFuncs.groovy b/TestON/JenkinsFile/dependencies/TriggerFuncs.groovy
index ffaa2b6..d3faeed 100644
--- a/TestON/JenkinsFile/dependencies/TriggerFuncs.groovy
+++ b/TestON/JenkinsFile/dependencies/TriggerFuncs.groovy
@@ -102,11 +102,11 @@
println jobOn + "-pipeline-" + manuallyRun ? "manually" : branch
def wiki = branch
- branch = funcs.branchWithPrefix( branch )
+ onos_branch = funcs.branchWithPrefix( branch )
test_branch = funcs.testBranchWithPrefix( branch )
node( "TestStation-" + nodeName + "s" ) {
- envSetup( branch, test_branch, onosTag, jobOn, manuallyRun )
- exportEnvProperty( branch, test_branch, wiki, tests, post_result, manuallyRun, onosTag, isOldFlow )
+ envSetup( onos_branch, test_branch, onosTag, jobOn, manuallyRun )
+ exportEnvProperty( onos_branch, test_branch, wiki, tests, post_result, manuallyRun, onosTag, isOldFlow )
}
jobToRun = jobOn + "-pipeline-" + ( manuallyRun ? "manually" : wiki )