From: madavi <jm00553988@techmahindra.com>
Date: Thu, 12 Sep 2019 12:05:17 +0000 (+0530)
Subject: Remove license check from Merge job
X-Git-Tag: v7.0.0rc1~64
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=4e0b32ad547306a7ba7afce730765f312af9f4e9;p=osm%2Fdevops.git

Remove license check from Merge job

Change-Id: Ie6d6ee1f4a05eab80cb7bf76b18849f5226c7c37
Signed-off-by: madavi <jm00553988@techmahindra.com>
---

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