Convert CLM job to regular JJB template

Change-Id: I2e8cf5c1f7d49e7b75bbbdad3d1140e6a4671350
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb-templates/project.yaml b/jjb-templates/project.yaml
index ebb7d9d0ac0f3deb8f9509fd18a2e80310f487c8..f701764e42bc2bc3faa91fa87ff00d5d335cf269 100644 (file)
--- a/jjb-templates/project.yaml
+++ b/jjb-templates/project.yaml
@@ -6,12 +6,14 @@
 - project:
     name: PROJECT_SHORTNAME
     jobs:
+        - '{name}-clm-{stream}'
 JOB_TEMPLATES
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     STREAMS
     project: 'PROJECT_PATH'
+    mvn-settings: 'JENKINS_SETTINGS'
 
 # For the Job templates below replace instances of:
 # PROJECT_SHORTNAME with your project name (eg. circuitsw)

diff --git a/jjb-templates/clm.yaml b/jjb/releng-templates-java.yaml
similarity index 74%
rename from jjb-templates/clm.yaml
rename to jjb/releng-templates-java.yaml
index c21f3e8f372d14d35631f37a324bcac6b6b2e965..f8cd06995485f1857699563fd4616df681842bb5 100644 (file)
--- a/jjb-templates/clm.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -1,6 +1,12 @@
 - job-template:
-    name: 'PROJECT_SHORTNAME-clm-{stream}'
-    disabled: false
+    # Template used for running CLM scans
+    # Arguements:
+    #   {name}         - Project Shortname
+    #   {project}      - Fully qualified project name
+    #   {mvn-settings} - Project maven settings file
+    #   {stream}
+    #   {jdk}
+    name: '{name}-clm-{stream}'
 
     project-type: maven
     node: dynamic_verify
@@ -9,8 +15,6 @@
     logrotate:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -31,14 +35,14 @@
     prebuilders:
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
-            settings-file: 'JENKINS_SETTINGS'
+            settings-file: '{mvn-settings}'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -V -B -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
-        settings: 'JENKINS_SETTINGS'
+        settings: '{mvn-settings}'
         settings-type: cfp
         global-settings: 'odl-global-settings'
         global-settings-type: cfp
@@ -46,10 +50,10 @@
     postbuilders:
         - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
-            application-name: PROJECT_SHORTNAME
+            application-name: '{name}'
 
     publishers:
         - email-notification:
-            email-prefix: '[PROJECT_SHORTNAME]'
+            email-prefix: '[{name}]'
         - archive-build:
             maven-version: '{mvn33}'

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index 233ff88e5889f3721a7a4f237a28297d015db841..b33e7183b7dbab4bca9366b897cf9715f9e43859 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -60,7 +60,6 @@ else:
     templates = (
         "verify,merge,periodic,distribution,distribution-check,integration,"
         "sonar")
-templates += ",clm"  # ensure we always create a clm job for all projects
 templates += ",validate-autorelease"  # Autorelease validate template
 
 ##################