From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Wed, 20 Sep 2017 19:58:32 +0000 (-0400)
Subject: fix for retrieval of image from repo via <$branch>
X-Git-Tag: v3.0.0rc~6
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=ea319bf0b1a31f21889f6bc0d2f4755a6b934159;p=osm%2Fdevops.git

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

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

diff --git a/jenkins/ci-pipelines/ci_helper.groovy b/jenkins/ci-pipelines/ci_helper.groovy
index 243a13d0..c047a120 100644
--- a/jenkins/ci-pipelines/ci_helper.groovy
+++ b/jenkins/ci-pipelines/ci_helper.groovy
@@ -33,8 +33,8 @@ def get_archive(artifactory_server, mdg, branch, build_name, build_number, patte
 
     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) {