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 d7b99509d2095ba3a38bf95bca826b93f4329d85..6c92aa34e1f87a1a9ba6ba4000ebba80cdc5e9bf 100644 (file)
--- a/jjb-templates/clm.yaml
+++ b/jjb-templates/clm.yaml
@@ -1,9 +1,9 @@
 - job-template:
-    name: 'PROJECT-clm'
+    name: 'PROJECT-clm-{stream}'
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: '{jdk}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -19,7 +19,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     wrappers:
         - build-timeout
@@ -34,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: