X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_2.groovy;h=67d1b5b607ca1026743d332f4b90698dd2062d1a;hb=refs%2Fchanges%2F48%2F10248%2F7;hp=ddbd80aae6e36a93feb84891defa65470a574a70;hpb=ff53f35303d2a99e5c2aa31619e1b12aff9b2fad;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index ddbd80aa..67d1b5b6 100644
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -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()