X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fclm.yaml;h=1a0b5a77402318849b4cc8eed5347be52a68f591;hb=e6dadb34e0f43397924893e5e872ec26f56eee88;hp=d7b99509d2095ba3a38bf95bca826b93f4329d85;hpb=b2b18042a298c488839bec7014548a148cb54eeb;p=releng%2Fbuilder.git

diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
index d7b99509d..1a0b5a774 100644
--- a/jjb-templates/clm.yaml
+++ b/jjb-templates/clm.yaml
@@ -1,9 +1,10 @@
 - job-template:
-    name: 'PROJECT-clm'
+    name: 'PROJECT_SHORTNAME-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: '{jdk}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -19,7 +20,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     wrappers:
         - build-timeout
@@ -32,19 +33,23 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
-        settings: '{PROJECT-settings}'
+        settings: '{JENKINS_SETTINGS}'
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
-            application-name: PROJECT
+            application-name: PROJECT_SHORTNAME
 
     publishers:
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'