commit 94c0e2712e1b33d25e5a4ff1f03e1fe1bcdd8f48
author Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Tue Jun 11 13:51:10 2019 -0700
committer Jeremy Ronquillo <j_ronquillo@u.pacific.edu> Tue Jun 11 13:51:10 2019 -0700
tree c348cfe1f3ba70a3311f9144a73e5f3a1ff183a1
parent 3c2f10d3855453630539afe102e47cc85ead5c58

Fix for branch to branch_code conversion in Jenkins Pipeline

Change-Id: I3394a8570186096268f05191c0ecb209fac2b74e

TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy

diff --git a/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy b/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy
index 5badbcc..4d263c6 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsTestONTests.groovy
@@ -126,8 +126,10 @@
 }
 
 def convertBranchToBranchCode( branch ){
-    if ( branch == "master" || branch.substring( 0, 1 ) == "o" ){
+    if ( branch == "master" ){
         return branch
+    } else if ( branch.substring( 0, 1 ) == "o" ) {
+        return branch.substring( 0, 6 ) + ".x"
     } else {
         return "onos-" + branch.substring( 0, 1 ) + ".x"
     }