Merge "Change python test trigger to use integration trigger macros"

[releng/builder.git] / jjb-templates / clm.yaml

diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
index 22e253d4d3a507111cfd06a928b95a9564f95818..6c92aa34e1f87a1a9ba6ba4000ebba80cdc5e9bf 100644 (file)
--- a/jjb-templates/clm.yaml
+++ b/jjb-templates/clm.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-clm'
+    name: 'PROJECT-clm-{stream}'
 
     project-type: maven
     node: dynamic_verify
@@ -19,12 +19,13 @@
         - 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'
@@ -33,11 +34,11 @@
         - wipe-org-opendaylight-repo
 
     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'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
-        settings: '{PROJECT-settings}'
+        settings: '{JENKINS_SETTINGS}'
         global-settings: '{odl-global-settings}'
 
     postbuilders: