X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=1c0c3675230e21e18716369557bfd77b93a35b4a;hb=5849bbb8c0b6d9c8732e707f463604d58bec0713;hp=a788f7bd6c8e6f77f6bb550a51b39a8c42f3043e;hpb=aa7dbd3fc05068b77f42e8698ea4dda3d02cc470;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index a788f7bd..1c0c3675 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -122,6 +122,9 @@ node("${params.NODE}") {
                     // the upstream job name contains suffix with the project. Need this stripped off
                     def project_without_branch = params.UPSTREAM_JOB_NAME.split('/')[0]
 
+                    // Remove the previous artifact for this component. Use the new upstream artifact
+                    sh "rm -rf pool/${component}"
+
                     ci_helper.get_archive(params.ARTIFACTORY_SERVER,component,GERRIT_BRANCH, "${project_without_branch} :: ${GERRIT_BRANCH}", build_num)
 
                     sh "rm -rf dists"
@@ -152,6 +155,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"
@@ -231,7 +235,10 @@ node("${params.NODE}") {
                 stage("Smoke") {
                     run_systest(container_name,container_name,"smoke")
                     // archive smoke success until stage_4 is ready
-                    stage_archive = params.SAVE_ARTIFACTS_ON_SMOKE_SUCCESS
+
+                    if ( ! currentBuild.result.equals('UNSTABLE') ) {
+                        stage_archive = params.SAVE_ARTIFACTS_ON_SMOKE_SUCCESS
+                    }
                 }
             }
 
@@ -257,7 +264,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')
                     }
                 }