X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_2.groovy;h=049763c6ee0f99c5ce32b2e82d68b6b868350fc0;hb=9cc6c8da7a99c9384d9b5316df2c8fde74624685;hp=76201111402b84211127573e5552152446b9923c;hpb=f94dd8ac7841b04e51bb50924b9ef369a6752b5e;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index 76201111..049763c6 100644
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -1,7 +1,7 @@
 /* Copyright 2017 Sandvine
  *
  * All Rights Reserved.
- * 
+ *
  *   Licensed under the Apache License, Version 2.0 (the "License"); you may
  *   not use this file except in compliance with the License. You may obtain
  *   a copy of the License at
@@ -20,6 +20,7 @@ def project_checkout(url_prefix,project,refspec,revision) {
     // this is done automaticaly by the multibranch pipeline plugin
     // git url: "${url_prefix}/${project}"
 
+    sh "git fetch --tags"
     sh "git fetch origin ${refspec}"
     if (GERRIT_PATCHSET_REVISION.size() > 0 ) {
         sh "git checkout -f ${revision}"
@@ -39,7 +40,12 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
     }
 
     stage('License Scan') {
+      if (!JOB_NAME.contains('merge')) {
         sh "devops/tools/license_scan.sh"
+      }
+      else {
+        println("skip the scan for merge")
+      }
     }
 
     container_name = "${project}-${branch}".toLowerCase()
@@ -55,15 +61,46 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
     withDockerContainer(image: "${container_name}", args: docker_args) {
         stage('Test') {
             sh 'devops-stages/stage-test.sh'
+            if (fileExists('coverage.xml')) {
+                cobertura coberturaReportFile: 'coverage.xml'
+            }
+            if (fileExists('nosetests.xml')) {
+                junit 'nosetests.xml'
+            }
         }
         stage('Build') {
             sh(returnStdout:true,  script: 'devops-stages/stage-build.sh').trim()
         }
+        stage('Archive') {
+            sh "mkdir -p changelog"
+            sh "devops/tools/generatechangelog-pipeline.sh > changelog/changelog-${mdg}.html"
+            sh(returnStdout:true,  script: 'devops-stages/stage-archive.sh').trim()
+            ci_helper.archive(artifactory_server,mdg,branch,'untested')
+        }
     }
 
-    stage('Archive') {
-        sh(returnStdout:true,  script: 'devops-stages/stage-archive.sh').trim()
-        ci_helper.archive(artifactory_server,mdg,branch,'untested')
+    if (fileExists('snap/snapcraft.yaml')) {
+        stage('Snap build') {
+            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 rm -rf ${WORKSPACE}/stage/ ${WORKSPACE}/parts/ ${WORKSPACE}/prime/"
+
+            REV=""
+            if ( !JOB_NAME.contains('merge') ) {
+                REV="/"+"${GERRIT_REFSPEC}".replaceAll('/','-')
+            }
+            channel="latest"
+            if (BRANCH_NAME.startsWith("v")) {
+                channel=BRANCH_NAME.substring(1)
+            } else if (BRANCH_NAME!="master") {
+                REV="/"+BRANCH_NAME+REV.replaceAll('/','-')
+            }
+
+            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\""
+        }
     }
 
     if ( do_stage_3 ) {