commit 31ed90135a4c41b9d46412a2ec1512ed0ad6213f
author Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Tue Jun 11 14:28:59 2019 -0700
committer Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Tue Jun 11 14:28:59 2019 -0700
tree ef6fe7ba375cc5a27dca8e47cba9e43f099075ff
parent 94c0e2712e1b33d25e5a4ff1f03e1fe1bcdd8f48

fix branch prefix in pipeline

Change-Id: Ic4d921782178ad5be807fa555903d0081b5b1b2a

TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy

diff --git a/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy b/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy
index 4d263c6..a93fa1c 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy
@@ -105,7 +105,7 @@
         for ( subDict in tests[ key ][ "schedules" ] ){
             sch = subDict[ "day" ]
             if ( validSchedules.contains( sch ) && !branchesFromDayResult.contains( sch ) ){
-                branchesFromDayResult += convertBranchCodeToBranch( subDict[ "branch" ] )
+                branchesFromDayResult += convertBranchCodeToBranch( subDict[ "branch" ], false )
             }
         }
     }
@@ -135,6 +135,10 @@
     }
 }
 
+def removePrefixFromBranch( branchWithPrefix ){
+    return branchWithPrefix.minus( "onos-" )
+}
+
 // *************
 // Test Category
 // *************