Cherry picks from master

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

diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index 616f569..5cad17b 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -81,16 +81,16 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
 
     if (fileExists('snap/snapcraft.yaml')) {
         stage('Snap build') {
+            sh "docker pull snapcore/snapcraft:stable"
             sh "sudo rm -rf ${WORKSPACE}/stage/ ${WORKSPACE}/parts/ ${WORKSPACE}/prime/ ${WORKSPACE}/*.snap"
-            sh "docker run -v ${WORKSPACE}:/build --env BRANCH=${BRANCH_NAME} -w /build snapcore/snapcraft:stable /bin/bash -c 'apt update && snapcraft'"
-            sh "sudo mv ${WORKSPACE}/${mdg}_*.snap ${WORKSPACE}/${mdg}.snap"
+            sh "sudo snapcraft clean --use-lxd"
+            sh "snapcraft --use-lxd"
+            sh "mv ${WORKSPACE}/${mdg}_*.snap ${WORKSPACE}/${mdg}.snap"
             sh "sudo rm -rf ${WORKSPACE}/stage/ ${WORKSPACE}/parts/ ${WORKSPACE}/prime/"
 
             REV=""
             if ( !JOB_NAME.contains('merge') ) {
-                short_ref=sh(returnStdout: true,
-                    script: "git rev-parse --short HEAD").trim()
-                REV="/"+short_ref
+                REV="/"+"${GERRIT_REFSPEC}".replaceAll('/','-')
             }
             channel="latest"
             if (BRANCH_NAME.startsWith("v")) {
@@ -102,6 +102,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
             sh "sudo docker run -v ~/.snapcraft:/snapcraft -v ${WORKSPACE}:/build " +
                 "-w /build snapcore/snapcraft:stable /bin/bash -c " +
                 "\"snapcraft login --with /snapcraft/config ; snapcraft push --release=${channel}/edge${REV} ${mdg}.snap\""
+            sh "sudo rm -rf ${WORKSPACE}/*.snap"
         }
     }