X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb-templates%2Fclm.yaml;h=ff6f8e5b8e79a875ad8e51f28de1c55945113a9b;hb=f4be4d1ea67d88e0bb0363d9aeee23e85ffc2412;hp=22e253d4d3a507111cfd06a928b95a9564f95818;hpb=21ea8d0ab9c8b932be4d0b24ce39ed336bf9cdfe;p=releng%2Fbuilder.git

diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
index 22e253d4d..ff6f8e5b8 100644
--- a/jjb-templates/clm.yaml
+++ b/jjb-templates/clm.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-clm'
+    name: 'PROJECT_SHORTNAME-clm-{stream}'
 
     project-type: maven
     node: dynamic_verify
@@ -19,31 +19,35 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - timed: '@weekly'
 
     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 -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:
         - check-clm:
-            application-name: PROJECT
+            application-name: PROJECT_SHORTNAME
 
     publishers:
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'