X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_helper.groovy;h=c047a12014f4e32867b9623be76dec30e5ca2ab6;hb=32762293b65637677d4e1236e06bf1a2df0eb930;hp=974cd8d0a024f8991a3e50d828429adacfbc88b5;hpb=8343e3fc441f1669ae906e85699e3f244dddc0b0;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_helper.groovy b/jenkins/ci-pipelines/ci_helper.groovy
index 974cd8d0..c047a120 100644
--- a/jenkins/ci-pipelines/ci_helper.groovy
+++ b/jenkins/ci-pipelines/ci_helper.groovy
@@ -15,10 +15,8 @@
  *   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}")
 
@@ -27,7 +25,7 @@ def get_archive(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}"
         }
      ]
@@ -35,8 +33,8 @@ def get_archive(mdg, branch, build_name, build_number, pattern='*') {
 
     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) {
@@ -72,8 +70,8 @@ def get_ip_from_container( container_name ) {
     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-'
@@ -81,19 +79,19 @@ def archive(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
         }]
@@ -113,10 +111,10 @@ def archive(mdg,branch,status) {
 
 //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-'