Fix docker tag in stage3 to coexist with periodic clean-up

[osm/devops.git] / jenkins / ci-pipelines / ci_stage_3.groovy

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 3f1190f..83ae27e 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -215,10 +215,11 @@ node("${params.NODE}") {
 ///////////////////////////////////////////////////////////////////////////////////////
         stage('Copy Artifacts') {
             // cleanup any previous repo
-            sh "pwd"
-            sh "tree -fD repo"
-            sh "lsof repo"
-            sh "rm -rfv repo"
+            println("Logging system info before deleting repo.")
+            sh("pwd")
+            sh("tree -fD repo")
+            println("Trying to delete previous repo...")
+            sh("rm -rfv repo")
             dir('repo') {
                 packageList = []
                 dir("${RELEASE}") {
@@ -636,7 +637,7 @@ EOF"""
                                 parallelSteps[module] = {
                                     dir("$module") {
                                         sh("docker pull ${INTERNAL_DOCKER_REGISTRY}opensourcemano/${moduleName}:${moduleTag}")
-                                        sh("""docker tag opensourcemano/${moduleName}:${moduleTag} \
+                                        sh("""docker tag ${INTERNAL_DOCKER_REGISTRY}opensourcemano/${moduleName}:${moduleTag} \
                                            opensourcemano/${moduleName}:${dockerTag}""")
                                         sh "docker push opensourcemano/${moduleName}:${dockerTag}"
                                     }