projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Extended stage_2 pipeline: Allow unittests to be executed in a privileged...
[osm/devops.git]
/
jenkins
/
ci-pipelines
/
ci_helper.groovy
diff --git
a/jenkins/ci-pipelines/ci_helper.groovy
b/jenkins/ci-pipelines/ci_helper.groovy
index
a731267
..
c047a12
100644
(file)
--- 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": "./",
"files": [
{
"target": "./",
- "pattern": "${repo_prefix}${mdg}/${pattern}",
+ "pattern": "${repo_prefix}${mdg}/${
branch}/${
pattern}",
"build": "${build_name}/${build_number}"
}
]
"build": "${build_name}/${build_number}"
}
]
@@
-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
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 ${b
ranch}/${b
uild_num}/* ."
+ sh "rm -rf ${b
ranch}/${b
uild_num}"
}
def get_env_value(build_env_file,key) {
}
def get_env_value(build_env_file,key) {
@@
-79,19
+79,19
@@
def archive(artifactory_server,mdg,branch,status) {
"files": [
{
"pattern": "dists/*.gz",
"files": [
{
"pattern": "dists/*.gz",
- "target": "${repo_prefix}${mdg}/${BUILD_NUMBER}/",
+ "target": "${repo_prefix}${mdg}/${
branch}/${
BUILD_NUMBER}/",
"props": "${properties}",
"flat": false
},
{
"pattern": "dists/*Packages",
"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",
"props": "${properties}",
"flat": false
},
{
"pattern": "pool/*/*.deb",
- "target": "${repo_prefix}${mdg}/${BUILD_NUMBER}/",
+ "target": "${repo_prefix}${mdg}/${
branch}/${
BUILD_NUMBER}/",
"props": "${properties}",
"flat": false
}]
"props": "${properties}",
"flat": false
}]