Adding logging around repo

[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 f7e77c6..5709807 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -216,7 +216,9 @@ node("${params.NODE}") {
 ///////////////////////////////////////////////////////////////////////////////////////
         stage('Copy Artifacts') {
             // cleanup any previous repo
-            sh 'rm -rf repo'
+            sh "tree -fD repo || exit 0"
+            sh 'rm -rvf repo'
+            sh "tree -fD repo && lsof repo || exit 0"
             dir('repo') {
                 packageList = []
                 dir("${RELEASE}") {
@@ -324,6 +326,8 @@ node("${params.NODE}") {
                 ci_helper.check_status_http_server(NODE_IP_ADDRESS, repo_port)
             }
 
+            sh "tree -fD repo"
+
             // Unpack devops package into temporary location so that we use it from upstream if it was part of a patch
             osm_devops_dpkg = sh(returnStdout: true, script: 'find ./repo/release/pool/ -name osm-devops*.deb').trim()
             devopstempdir = sh(returnStdout: true, script: 'mktemp -d').trim()
@@ -497,7 +501,7 @@ node("${params.NODE}") {
                     ]
 
                     sshCommand remote: remote, command: '''
-                        wget https://osm-download.etsi.org/ftp/osm-11.0-eleven/install_osm.sh
+                        wget https://osm-download.etsi.org/ftp/osm-12.0-twelve/install_osm.sh
                         chmod +x ./install_osm.sh
                         sed -i '1 i\\export PATH=/snap/bin:\$PATH' ~/.bashrc
                     '''
@@ -633,6 +637,7 @@ EOF"""
 
                                 parallelSteps[module] = {
                                     dir("$module") {
+                                        sh("docker pull ${INTERNAL_DOCKER_REGISTRY}opensourcemano/${moduleName}:${moduleTag}")
                                         sh("""docker tag opensourcemano/${moduleName}:${moduleTag} \
                                            opensourcemano/${moduleName}:${dockerTag}""")
                                         sh "docker push opensourcemano/${moduleName}:${dockerTag}"