Removing charm promotion
[osm/devops.git] / jenkins / ci-pipelines / ci_stage_3.groovy
index 4587caf..9d5a6e4 100644 (file)
@@ -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}") {
@@ -317,9 +321,10 @@ node("${params.NODE}") {
                 repo_port = sh(script: 'echo $(python -c \'import socket; s=socket.socket(); s.bind(("", 0));' +
                                'print(s.getsockname()[1]); s.close()\');',
                                returnStdout: true).trim()
-                repo_base_url = ci_helper.start_http_server(pwd, http_server_name, repo_port)
+                internal_docker_http_server_url = ci_helper.start_http_server(pwd, http_server_name, repo_port)
                 NODE_IP_ADDRESS = sh(returnStdout: true, script:
                     "echo ${SSH_CONNECTION} | awk '{print \$3}'").trim()
+                ci_helper.check_status_http_server(NODE_IP_ADDRESS, repo_port)
             }
 
             // Unpack devops package into temporary location so that we use it from upstream if it was part of a patch
@@ -446,6 +451,8 @@ node("${params.NODE}") {
                         logLevel: 'INFO',
                         pty: true
                     ]
+                    // Ensure the VM is ready
+                    sshCommand remote: remote, command: 'cloud-init status --wait'
 
                     // Force time sync to avoid clock drift and invalid certificates
                     sshCommand remote: remote, command: 'sudo apt-get update'
@@ -614,9 +621,6 @@ EOF"""
 
             if (params.SAVE_ARTIFACTS_OVERRIDE || stage_archive) {
                 stage('Archive') {
-                    sh "echo ${containerName} > build_version.txt"
-                    archiveArtifacts artifacts: 'build_version.txt', fingerprint: true
-
                     // Archive the tested repo
                     dir("${RELEASE_DIR}") {
                         ci_helper.archive(params.ARTIFACTORY_SERVER, RELEASE, GERRIT_BRANCH, 'tested')
@@ -632,7 +636,8 @@ EOF"""
 
                                 parallelSteps[module] = {
                                     dir("$module") {
-                                        sh("""docker tag opensourcemano/${moduleName}:${moduleTag} \
+                                        sh("docker pull ${INTERNAL_DOCKER_REGISTRY}opensourcemano/${moduleName}:${moduleTag}")
+                                        sh("""docker tag ${INTERNAL_DOCKER_REGISTRY}opensourcemano/${moduleName}:${moduleTag} \
                                            opensourcemano/${moduleName}:${dockerTag}""")
                                         sh "docker push opensourcemano/${moduleName}:${dockerTag}"
                                     }
@@ -640,32 +645,32 @@ EOF"""
                             }
                             parallel parallelSteps
                         }
-
                         stage('Snap promotion') {
-                            snaps = ['osmclient']
-                            sh 'snapcraft login --with ~/.snapcraft/config'
-                            for (snap in snaps) {
-                                channel = 'latest/'
-                                if (BRANCH_NAME.startsWith('v')) {
-                                    channel = BRANCH_NAME.substring(1) + '/'
-                                } else if (BRANCH_NAME != 'master') {
-                                    channel += '/' + BRANCH_NAME.replaceAll('/', '-')
-                                }
-                                track = channel + 'edge\\*'
-                                edge_rev = sh(returnStdout: true,
-                                    script: "snapcraft revisions $snap | " +
-                                    "grep \"$track\" | tail -1 | awk '{print \$1}'").trim()
-                                print "edge rev is $edge_rev"
-                                track = channel + 'beta\\*'
-                                beta_rev = sh(returnStdout: true,
-                                    script: "snapcraft revisions $snap | " +
-                                    "grep \"$track\" | tail -1 | awk '{print \$1}'").trim()
-                                print "beta rev is $beta_rev"
-
-                                if (edge_rev != beta_rev) {
-                                    print "Promoting $edge_rev to beta in place of $beta_rev"
-                                    beta_track = channel + 'beta'
-                                    sh "snapcraft release $snap $edge_rev $beta_track"
+                            withCredentials([string(credentialsId: 'Snapstore', variable: 'SNAPCRAFT_STORE_CREDENTIALS')]) {
+                                snaps = ['osmclient']
+                                for (snap in snaps) {
+                                    channel = 'latest/'
+                                    if (BRANCH_NAME.startsWith('v')) {
+                                        channel = BRANCH_NAME.substring(1) + '/'
+                                    } else if (BRANCH_NAME != 'master') {
+                                        channel += '/' + BRANCH_NAME.replaceAll('/', '-')
+                                    }
+                                    track = channel + 'edge\\*'
+                                    edge_rev = sh(returnStdout: true,
+                                        script: "snapcraft revisions $snap | " +
+                                        "grep \"$track\" | tail -1 | awk '{print \$1}'").trim()
+                                    track = channel + 'beta\\*'
+                                    beta_rev = sh(returnStdout: true,
+                                        script: "snapcraft revisions $snap | " +
+                                        "grep \"$track\" | tail -1 | awk '{print \$1}'").trim()
+
+                                    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 "snapcraft release $snap $edge_rev $beta_track"
+                                    }
                                 }
                             }
                         } // stage('Snap promotion')
@@ -674,33 +679,37 @@ EOF"""
             } // if (params.SAVE_ARTIFACTS_OVERRIDE || stage_archive)
         } // dir(OSM_DEVOPS)
     } finally {
-       stage('Archive Container Logs') {
-            if ( ARCHIVE_LOGS_FLAG ) {
-                // Archive logs
-                remote = [
-                    name: containerName,
-                    host: IP_ADDRESS,
-                    user: 'ubuntu',
-                    identityFile: SSH_KEY,
-                    allowAnyHosts: true,
-                    logLevel: 'INFO',
-                    pty: true
-                ]
-                println('Archiving container logs')
-                archive_logs(remote)
+        stage('Archive Container Logs') {
+            if (ARCHIVE_LOGS_FLAG) {
+                try {
+                    // Archive logs
+                    remote = [
+                        name: containerName,
+                        host: IP_ADDRESS,
+                        user: 'ubuntu',
+                        identityFile: SSH_KEY,
+                        allowAnyHosts: true,
+                        logLevel: 'INFO',
+                        pty: true
+                    ]
+                    println('Archiving container logs')
+                    archive_logs(remote)
+                } catch (Exception e) {
+                    println('Error fetching logs: '+ e.getMessage())
+                }
             } // 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
@@ -712,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}"
             }
         }