projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes OVF converter and upload
[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
ddbd80a
..
c433c14
100644
(file)
--- 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') {
}
stage('License Scan') {
+ if (!JOB_NAME.contains('merge')) {
sh "devops/tools/license_scan.sh"
sh "devops/tools/license_scan.sh"
+ }
+ else {
+ println("skip the scan for merge")
+ }
}
container_name = "${project}-${branch}".toLowerCase()
}
container_name = "${project}-${branch}".toLowerCase()