X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_3.groovy;h=9d5a6e4c10bd649fe5d05c489861042a5fe1cbc6;hb=e70dbaaf260bfb746129a439edb40590cfacdaf2;hp=e51599388dd9e3299457b13cdb87d5c91c11554b;hpb=968966bb572960e23df77d6a3c93a52bc7ef85a3;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index e5159938..9d5a6e4c 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -215,7 +215,11 @@ node("${params.NODE}") {
 ///////////////////////////////////////////////////////////////////////////////////////
         stage('Copy Artifacts') {
             // cleanup any previous repo
-            sh 'rm -rf 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}") {
@@ -633,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}"
                                     }
@@ -670,63 +674,13 @@ EOF"""
                                 }
                             }
                         } // stage('Snap promotion')
-                        stage('Charm promotion') {
-                            charms = [
-                                'osm', // bundle
-                                'osm-ha', // bundle
-                                'osm-grafana',
-                                'osm-mariadb',
-                                'osm-lcm',
-                                'osm-mon',
-                                'osm-nbi',
-                                'osm-ng-ui',
-                                'osm-pol',
-                                'osm-ro',
-                                'osm-prometheus',
-                            ]
-                            for (charm in charms) {
-
-                                channel = 'latest'
-                                if (BRANCH_NAME.startsWith('v')) {
-                                    channel = BRANCH_NAME.substring(1)
-                                } else if (BRANCH_NAME != 'master') {
-                                    channel += '/' + BRANCH_NAME.replaceAll('/', '-')
-                                }
-
-                                withCredentials([string(credentialsId: 'Charmstore', variable: 'CHARMCRAFT_AUTH')]) {
-                                    sh "charmcraft status $charm --format json > ${charm}.json"
-                                    isCharm = sh(returnStdout: true, script: "grep architecture ${charm}.json | wc -l").trim() as int
-                                    if (isCharm) {
-                                        jqScriptEdge = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"$channel/edge/merged\")| .version'|head -1"
-                                        jqScriptBeta = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[] | select(.base.architecture==\"amd64\" and .base.channel==\"20.04\") | .releases[] | select(.channel==\"$channel/beta\")| .version'|head -1"
-                                    } else {
-                                        jqScriptEdge = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[].releases[] | select(.channel==\"$channel/edge/merged\")| .version'|head -1"
-                                        jqScriptBeta = "cat ${charm}.json | jq -r '.[] | select(.track==\"$channel\") | .mappings[].releases[] | select(.channel==\"$channel/beta\")| .version'|head -1"
-                                    }
-                                    // edge/merged is used in place of /edge as 10.1.0 LTS uses latest/edge
-                                    edge_rev = sh(returnStdout: true, script: jqScriptEdge).trim()
-                                    beta_rev = sh(returnStdout: true, script: jqScriptBeta).trim()
-                                    try { edge_rev = edge_rev as int } catch (NumberFormatException nfe) {edge_rev = 0}
-                                    try { beta_rev = beta_rev as int } catch (NumberFormatException nfe) {beta_rev = 0}
-
-                                    print "Edge: $edge_rev, Beta: $beta_rev"
-
-                                    if (edge_rev > beta_rev) {
-                                        print "Promoting $edge_rev to beta in place of $beta_rev"
-                                        beta_track = channel + 'beta'
-                                        sh "charmcraft release ${charm} --revision=${edge_rev} --channel=${channel}/beta"
-                                    }
-
-                                }
-                            }
-                        } // stage('Charm promotion')
                     } // if (params.DO_DOCKERPUSH)
                 } // stage('Archive')
             } // if (params.SAVE_ARTIFACTS_OVERRIDE || stage_archive)
         } // dir(OSM_DEVOPS)
     } finally {
-       stage('Archive Container Logs') {
-            if ( ARCHIVE_LOGS_FLAG ) {
+        stage('Archive Container Logs') {
+            if (ARCHIVE_LOGS_FLAG) {
                 try {
                     // Archive logs
                     remote = [
@@ -746,16 +700,16 @@ EOF"""
             } // end if ( ARCHIVE_LOGS_FLAG )
         }
         stage('Cleanup') {
-            if ( params.DO_INSTALL && server_id != null) {
+            if (params.DO_INSTALL && server_id != null) {
                 delete_vm = true
-                if (error && params.SAVE_CONTAINER_ON_FAIL ) {
+                if (error && params.SAVE_CONTAINER_ON_FAIL) {
                     delete_vm = false
                 }
-                if (!error && params.SAVE_CONTAINER_ON_PASS ) {
+                if (!error && params.SAVE_CONTAINER_ON_PASS) {
                     delete_vm = false
                 }
 
-                if ( delete_vm ) {
+                if (delete_vm) {
                     if (server_id != null) {
                         println("Deleting VM: $server_id")
                         sh """#!/bin/sh -e
@@ -767,12 +721,12 @@ EOF"""
                     }
                 }
             }
-            if ( http_server_name != null ) {
+            if (http_server_name != null) {
                 sh "docker stop ${http_server_name} || true"
                 sh "docker rm ${http_server_name} || true"
             }
 
-            if ( devopstempdir != null ) {
+            if (devopstempdir != null) {
                 sh "rm -rf ${devopstempdir}"
             }
         }