commit ea319bf0b1a31f21889f6bc0d2f4755a6b934159
author Mike Marchetti <mmarchetti@sandvine.com> Wed Sep 20 15:58:32 2017 -0400
committer Mike Marchetti <mmarchetti@sandvine.com> Wed Sep 20 15:58:32 2017 -0400
tree 6f53135b1e42814a3160ff655d820260080ce70e
parent c121ff81ff1018d0f59af6d04503f3e8087e7c74

fix for retrieval of image from repo via <$branch>

Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>

jenkins/ci-pipelines/ci_helper.groovy

diff --git a/jenkins/ci-pipelines/ci_helper.groovy b/jenkins/ci-pipelines/ci_helper.groovy
index 243a13d..c047a12 100644
--- a/jenkins/ci-pipelines/ci_helper.groovy
+++ b/jenkins/ci-pipelines/ci_helper.groovy
@@ -33,8 +33,8 @@
 
     server.download(downloadSpec)
     // workaround.  flatten and repo the specific build num from the directory
-    sh "cp -R ${build_num}/* ."
-    sh "rm -rf ${build_num}"
+    sh "cp -R ${branch}/${build_num}/* ."
+    sh "rm -rf ${branch}/${build_num}"
 }
 
 def get_env_value(build_env_file,key) {