From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Tue, 12 Sep 2017 14:36:02 +0000 (-0400)
Subject: add branch to repo dir for easy cleanup
X-Git-Tag: v3.0.0rc~8
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F90%2F2190%2F1;p=osm%2Fdevops.git

add branch to repo dir for easy cleanup

Change-Id: Ia0cdd0c22e68bfed70577298fa4516200449f7b1
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 a7312672..243a13d0 100644
--- a/jenkins/ci-pipelines/ci_helper.groovy
+++ b/jenkins/ci-pipelines/ci_helper.groovy
@@ -25,7 +25,7 @@ def get_archive(artifactory_server, mdg, branch, build_name, build_number, patte
      "files": [
         {
           "target": "./",
-          "pattern": "${repo_prefix}${mdg}/${pattern}",
+          "pattern": "${repo_prefix}${mdg}/${branch}/${pattern}",
           "build": "${build_name}/${build_number}"
         }
      ]
@@ -79,19 +79,19 @@ def archive(artifactory_server,mdg,branch,status) {
      "files": [
         {
           "pattern": "dists/*.gz",
-          "target": "${repo_prefix}${mdg}/${BUILD_NUMBER}/",
+          "target": "${repo_prefix}${mdg}/${branch}/${BUILD_NUMBER}/",
           "props": "${properties}",
           "flat": false
         },
         {
           "pattern": "dists/*Packages",
-          "target": "${repo_prefix}${mdg}/${BUILD_NUMBER}/",
+          "target": "${repo_prefix}${mdg}/${branch}/${BUILD_NUMBER}/",
           "props": "${properties}",
           "flat": false
         },
         {
           "pattern": "pool/*/*.deb",
-          "target": "${repo_prefix}${mdg}/${BUILD_NUMBER}/",
+          "target": "${repo_prefix}${mdg}/${branch}/${BUILD_NUMBER}/",
           "props": "${properties}",
           "flat": false
         }]