From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Fri, 21 Sep 2018 20:01:11 +0000 (-0400)
Subject: Use release dir for artifact upload
X-Git-Tag: v5.0.0~103
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F6547%2F1;p=osm%2Fdevops.git

Use release dir for artifact upload

Change-Id: I1ba89d80e65f4d7aec58c825004f89cda632067f
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
---

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index a788f7bd..1d1527cd 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -152,6 +152,7 @@ node("${params.NODE}") {
                    rm -f changelog/changelog-osm.html
                    [ ! -d changelog ] || for mdgchange in \$(ls changelog); do cat changelog/\$mdgchange >> changelog/changelog-osm.html; done
                    """
+                RELEASE_DIR = sh(returnStdout:true,  script: 'pwd').trim()
             }
             // start an apache server to serve up the images
             http_server_name = "${container_name}-apache"
@@ -257,7 +258,7 @@ node("${params.NODE}") {
                     archiveArtifacts artifacts: "build_version.txt", fingerprint: true
 
                     // Archive the tested repo
-                    dir("repo/${RELEASE}") {
+                    dir("${RELEASE_DIR}") {
                         ci_helper.archive(params.ARTIFACTORY_SERVER,RELEASE,GERRIT_BRANCH,'tested')
                     }
                 }