Update automated project templates

[releng/builder.git] / jjb / snmp4sdn / snmp4sdn.yaml

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 3217d05d5753955f86cb9e6e9adfb388df39f760..1260eec675504edac407ab5e6387df51640fcd31 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -12,7 +12,7 @@
         - 'snmp4sdn-distribution-{stream}'
         - 'snmp4sdn-integration-{stream}'
         - 'snmp4sdn-sonar'
-        - 'snmp4sdn-clm'
+        - 'snmp4sdn-clm-{stream}'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -162,7 +162,7 @@
     maven:
         maven-name: '{mvn32}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar -Dmerge'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{snmp4sdn-settings}'
         global-settings: '{odl-global-settings}'
@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
-    name: 'snmp4sdn-clm'
+    name: 'snmp4sdn-clm-{stream}'
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: '{jdk}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     wrappers:
         - build-timeout