* under the License.
*/
-artifactory_server_id = 'artifactory-osm'
-
-def get_archive(mdg, branch, build_name, build_number, pattern='*') {
- server = Artifactory.server artifactory_server_id
+def get_archive(artifactory_server, mdg, branch, build_name, build_number, pattern='*') {
+ server = Artifactory.server artifactory_server
println("retrieve archive for ${mdg}/${branch}/${build_name}/${build_number}/${pattern}")
"files": [
{
"target": "./",
- "pattern": "${repo_prefix}${mdg}/${pattern}",
+ "pattern": "${repo_prefix}${mdg}/${branch}/${pattern}",
"build": "${build_name}/${build_number}"
}
]
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) {
return sh(returnStdout: true, script: "lxc list ${container_name} -c 4|grep eth0 |awk '{print \$2}'").trim()
}
-def archive(mdg,branch,status) {
- server = Artifactory.server artifactory_server_id
+def archive(artifactory_server,mdg,branch,status) {
+ server = Artifactory.server artifactory_server
def properties = "branch=${branch};status=${status}"
def repo_prefix = 'osm-'
"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
}]
//CANNOT use build promotion with OSS version of artifactory
// For now, will publish downloaded artifacts into a new repo.
-def promote_build(mdg,branch,buildInfo) {
+def promote_build(artifactory_server,mdg,branch,buildInfo) {
println("Promoting build: mdg: ${mdg} branch: ${branch} build: ${buildInfo.name}/${buildInfo.number}")
- server = Artifactory.server artifactory_server_id
+ server = Artifactory.server artifactory_server
//def properties = "branch=${branch};status=${status}"
def repo_prefix = 'osm-'