X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_2.groovy;h=4d23cf1759129bbd2538d3c21edf2cde516683fc;hb=4ae47aa2766aaaa432c8c77f23e97dbdfd7fb0f6;hp=ddbd80aae6e36a93feb84891defa65470a574a70;hpb=d3dd343665385d6f6ce7d0b37950857b87b5bc09;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index ddbd80aa..4d23cf17 100644
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -19,7 +19,8 @@ def project_checkout(url_prefix,project,refspec,revision) {
     // checkout the project
     // 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()