From b8e44736157151c3f26dd4e3c3dd66f10644deed Mon Sep 17 00:00:00 2001
From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Tue, 12 Sep 2017 10:36:02 -0400
Subject: [PATCH] add branch to repo dir for easy cleanup
Change-Id: Ia0cdd0c22e68bfed70577298fa4516200449f7b1
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
---
jenkins/ci-pipelines/ci_helper.groovy | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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
}]
--
GitLab