Update automated project templates

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

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 3f4869f66fedbfe4885f519cab5de907453b0429..85183fa51d42ae18bfe6ce899852c58271b0fe35 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -11,7 +11,7 @@
         - 'yangtools-distribution-{stream}'
         - 'yangtools-integration-{stream}'
         - 'yangtools-sonar'
-        - 'yangtools-clm'
+        - 'yangtools-clm-{stream}'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -91,7 +91,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: '{yangtools-settings}'
         global-settings: '{odl-global-settings}'
@@ -349,11 +349,11 @@
         - jacoco-report
 
 - job-template:
-    name: 'yangtools-clm'
+    name: 'yangtools-clm-{stream}'
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: '{jdk}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -369,7 +369,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     wrappers:
         - build-timeout