Update automated project templates

Change-Id: I2e33fe31f530d795f0d4b0715a49489dfbd61bd4
Signed-off-by: jenkins-releng <jenkins-releng@opendaylight.org>

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index c18a0dbe01eb1fe5e30e8f669d74cc357231a992..fea36beb0770d35494ed85990e1b09b859a6922a 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -12,7 +12,7 @@
         - 'aaa-distribution-{stream}'
         - 'aaa-integration-{stream}'
         - 'aaa-sonar'
         - 'aaa-distribution-{stream}'
         - 'aaa-integration-{stream}'
         - 'aaa-sonar'

-        - 'aaa-clm'
+        - 'aaa-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'aaa-clm'
+    name: 'aaa-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index a5e9da54e057f0e3c9387cdb32b48d087ae58a08..34d8584e1629cb7c0798bc54775de4e42c9b3db3 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -12,7 +12,7 @@
         - 'alto-distribution-{stream}'
         - 'alto-integration-{stream}'
         - 'alto-sonar'
         - 'alto-distribution-{stream}'
         - 'alto-integration-{stream}'
         - 'alto-sonar'

-        - 'alto-clm'
+        - 'alto-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -415,11 +415,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'alto-clm'
+    name: 'alto-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -435,7 +435,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 6aef9882546e764b0246552a658981bd63a971ef..1efb8c1a58da267307e9a83be526d3100a614f11 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -12,7 +12,7 @@
         - 'bgpcep-distribution-{stream}'
         - 'bgpcep-integration-{stream}'
         - 'bgpcep-sonar'
         - 'bgpcep-distribution-{stream}'
         - 'bgpcep-integration-{stream}'
         - 'bgpcep-sonar'

-        - 'bgpcep-clm'
+        - 'bgpcep-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -422,11 +422,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'bgpcep-clm'
+    name: 'bgpcep-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -442,7 +442,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 87b399408c0fe75dfebf132805bb3472868f7386..1aa3b43022dac21db97249a602a9465332431d95 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -12,7 +12,7 @@
         - 'capwap-distribution-{stream}'
         - 'capwap-integration-{stream}'
         - 'capwap-sonar'
         - 'capwap-distribution-{stream}'
         - 'capwap-integration-{stream}'
         - 'capwap-sonar'

-        - 'capwap-clm'
+        - 'capwap-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -415,11 +415,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'capwap-clm'
+    name: 'capwap-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -435,7 +435,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index d12189601d8526a9310ebe3a025bd33bd97978a2..51432741403c463192f1a79d617fa423d9d4e6e1 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -11,7 +11,7 @@
         - 'controller-distribution-{stream}'
         - 'controller-integration-{stream}'
         - 'controller-sonar'
         - 'controller-distribution-{stream}'
         - 'controller-integration-{stream}'
         - 'controller-sonar'

-        - 'controller-clm'
+        - 'controller-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -349,11 +349,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'controller-clm'
+    name: 'controller-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -369,7 +369,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index 023b38447a8821cad9b616a2beee90a37d924b72..0812967a1ceaddb8e5c44dd281d401e033101e96 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -12,7 +12,7 @@
         - 'coretutorials-distribution-{stream}'
         - 'coretutorials-integration-{stream}'
         - 'coretutorials-sonar'
         - 'coretutorials-distribution-{stream}'
         - 'coretutorials-integration-{stream}'
         - 'coretutorials-sonar'

-        - 'coretutorials-clm'
+        - 'coretutorials-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -415,11 +415,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'coretutorials-clm'
+    name: 'coretutorials-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -435,7 +435,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/defense4all/defense4all.yaml b/jjb/defense4all/defense4all.yaml
index 93620451a2b9d824edfd9475cab87171bd891d48..1b513d797edbec3ff6523fcfda774ee495e5bf3e 100644 (file)
--- a/jjb/defense4all/defense4all.yaml
+++ b/jjb/defense4all/defense4all.yaml
@@ -12,7 +12,7 @@
         - 'defense4all-distribution-{stream}'
         - 'defense4all-integration-{stream}'
         - 'defense4all-sonar'
         - 'defense4all-distribution-{stream}'
         - 'defense4all-integration-{stream}'
         - 'defense4all-sonar'

-        - 'defense4all-clm'
+        - 'defense4all-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'defense4all-clm'
+    name: 'defense4all-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 39cce2ab68841f10a8d57f9c5392114c359d457e..85c83631bc84f14d04f2949404b4ce28048ed5c5 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -12,7 +12,7 @@
         - 'didm-distribution-{stream}'
         - 'didm-integration-{stream}'
         - 'didm-sonar'
         - 'didm-distribution-{stream}'
         - 'didm-integration-{stream}'
         - 'didm-sonar'

-        - 'didm-clm'
+        - 'didm-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -415,11 +415,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'didm-clm'
+    name: 'didm-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -435,7 +435,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index 4cbfdbb3f1e37b71d58f29de3ddeaf9594cbb053..36f1170d557cc1f717cfe1c20e13300d9c34d434 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -12,7 +12,7 @@
         - 'discovery-distribution-{stream}'
         - 'discovery-integration-{stream}'
         - 'discovery-sonar'
         - 'discovery-distribution-{stream}'
         - 'discovery-integration-{stream}'
         - 'discovery-sonar'

-        - 'discovery-clm'
+        - 'discovery-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -410,11 +410,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'discovery-clm'
+    name: 'discovery-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -430,7 +430,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 4ec46179e4ad53487490447192ef0c2cb39aa533..03460d07e1917dd3f29466aafd7f305a9b9cf8b3 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -12,7 +12,7 @@
         - 'dlux-distribution-{stream}'
         - 'dlux-integration-{stream}'
         - 'dlux-sonar'
         - 'dlux-distribution-{stream}'
         - 'dlux-integration-{stream}'
         - 'dlux-sonar'

-        - 'dlux-clm'
+        - 'dlux-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'dlux-clm'
+    name: 'dlux-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml
index ceee97a4c0fe551878ef9e69798784765685f4f0..7b04ece73a31f2c39d615d8c1b89b1a98eb88c84 100644 (file)
--- a/jjb/docs/docs.yaml
+++ b/jjb/docs/docs.yaml
@@ -12,7 +12,7 @@
         - 'docs-distribution-{stream}'
         - 'docs-integration-{stream}'
         - 'docs-sonar'
         - 'docs-distribution-{stream}'
         - 'docs-integration-{stream}'
         - 'docs-sonar'

-        - 'docs-clm'
+        - 'docs-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'docs-clm'
+    name: 'docs-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 43d620c467b35d04fd9efa85e8b1f54be8e6f43a..f4cda8eb0e168a9d57deea993a4800dfbf5599eb 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -12,7 +12,7 @@
         - 'groupbasedpolicy-distribution-{stream}'
         - 'groupbasedpolicy-integration-{stream}'
         - 'groupbasedpolicy-sonar'
         - 'groupbasedpolicy-distribution-{stream}'
         - 'groupbasedpolicy-integration-{stream}'
         - 'groupbasedpolicy-sonar'

-        - 'groupbasedpolicy-clm'
+        - 'groupbasedpolicy-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'groupbasedpolicy-clm'
+    name: 'groupbasedpolicy-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 375e2cbe28fd61db77e0f0a1d0e1d3129822d53f..a6623a1521271b337f681417cbcaba1455044393 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -12,7 +12,7 @@
         - 'iotdm-distribution-{stream}'
         - 'iotdm-integration-{stream}'
         - 'iotdm-sonar'
         - 'iotdm-distribution-{stream}'
         - 'iotdm-integration-{stream}'
         - 'iotdm-sonar'

-        - 'iotdm-clm'
+        - 'iotdm-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -417,11 +417,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'iotdm-clm'
+    name: 'iotdm-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -437,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 4b19f4c2829dd0e0786eecd222a220f7b91d314d..9afc382bc51cf13309419f02d12ca507c7721ede 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -12,7 +12,7 @@
         - 'l2switch-distribution-{stream}'
         - 'l2switch-integration-{stream}'
         - 'l2switch-sonar'
         - 'l2switch-distribution-{stream}'
         - 'l2switch-integration-{stream}'
         - 'l2switch-sonar'

-        - 'l2switch-clm'
+        - 'l2switch-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'l2switch-clm'
+    name: 'l2switch-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 8daa2dfdd6e068b1312321b7efc79d08ed5ba228..6c2671d3368c4de44ca1f3686c3fea9b2e1aaad2 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -12,7 +12,7 @@
         - 'lacp-distribution-{stream}'
         - 'lacp-integration-{stream}'
         - 'lacp-sonar'
         - 'lacp-distribution-{stream}'
         - 'lacp-integration-{stream}'
         - 'lacp-sonar'

-        - 'lacp-clm'
+        - 'lacp-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -415,11 +415,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'lacp-clm'
+    name: 'lacp-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -435,7 +435,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 5265a71c7d3e1cc4ec6b37af171b8511659e983e..36764f6d1981412fc86ecc4256c0abec3af4a873 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -12,7 +12,7 @@
         - 'lispflowmapping-distribution-{stream}'
         - 'lispflowmapping-integration-{stream}'
         - 'lispflowmapping-sonar'
         - 'lispflowmapping-distribution-{stream}'
         - 'lispflowmapping-integration-{stream}'
         - 'lispflowmapping-sonar'

-        - 'lispflowmapping-clm'
+        - 'lispflowmapping-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -422,11 +422,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'lispflowmapping-clm'
+    name: 'lispflowmapping-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -442,7 +442,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 6632c8314fa47b9832ef4043bfde4284f2ca6bcb..19f367e7c624a60f721d66645e056fe0a06e4946 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -12,7 +12,7 @@
         - 'neutron-distribution-{stream}'
         - 'neutron-integration-{stream}'
         - 'neutron-sonar'
         - 'neutron-distribution-{stream}'
         - 'neutron-integration-{stream}'
         - 'neutron-sonar'

-        - 'neutron-clm'
+        - 'neutron-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -417,11 +417,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'neutron-clm'
+    name: 'neutron-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -437,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index f87bea78d2347fb84d5cdfd9404d5fa20548ef19..fd1339f484bfc0ca5f1020fcf0420a0a8151cefd 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -12,7 +12,7 @@
         - 'nic-distribution-{stream}'
         - 'nic-integration-{stream}'
         - 'nic-sonar'
         - 'nic-distribution-{stream}'
         - 'nic-integration-{stream}'
         - 'nic-sonar'

-        - 'nic-clm'
+        - 'nic-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -415,11 +415,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'nic-clm'
+    name: 'nic-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -435,7 +435,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 118a85daeccc313e26b4dd327db2fafcfba9ac10..06f1f878f67f6a23f2a400597873b8494b953d98 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -12,7 +12,7 @@
         - 'odlparent-distribution-{stream}'
         - 'odlparent-integration-{stream}'
         - 'odlparent-sonar'
         - 'odlparent-distribution-{stream}'
         - 'odlparent-integration-{stream}'
         - 'odlparent-sonar'

-        - 'odlparent-clm'
+        - 'odlparent-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'odlparent-clm'
+    name: 'odlparent-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 9ceff1361cb48550ae756a88e3e7ed51e6570ff1..0d709dff44ade81f0fb6fe6311591e34970f71d7 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -12,7 +12,7 @@
         - 'openflowjava-distribution-{stream}'
         - 'openflowjava-integration-{stream}'
         - 'openflowjava-sonar'
         - 'openflowjava-distribution-{stream}'
         - 'openflowjava-integration-{stream}'
         - 'openflowjava-sonar'

-        - 'openflowjava-clm'
+        - 'openflowjava-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -422,11 +422,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'openflowjava-clm'
+    name: 'openflowjava-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -442,7 +442,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 2f9504238b77fb9c8968f3241e3ced1b76a660d0..aaf32139a3de4fa1162fa4de1c0e3a7e4e7475a8 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -12,7 +12,7 @@
         - 'openflowplugin-distribution-{stream}'
         - 'openflowplugin-integration-{stream}'
         - 'openflowplugin-sonar'
         - 'openflowplugin-distribution-{stream}'
         - 'openflowplugin-integration-{stream}'
         - 'openflowplugin-sonar'

-        - 'openflowplugin-clm'
+        - 'openflowplugin-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -424,11 +424,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'openflowplugin-clm'
+    name: 'openflowplugin-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -444,7 +444,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index e32a35b6623ca417c9ac326d68b7fbd6e666b6c3..ac1a0e9e6f23182861cadc880a753c21c239009f 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -11,7 +11,7 @@
         - 'ovsdb-daily-{stream}'
         - 'ovsdb-distribution-{stream}'
         - 'ovsdb-integration-{stream}'
         - 'ovsdb-daily-{stream}'
         - 'ovsdb-distribution-{stream}'
         - 'ovsdb-integration-{stream}'

-        - 'ovsdb-clm'
+        - 'ovsdb-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -365,11 +365,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'ovsdb-clm'
+    name: 'ovsdb-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -385,7 +385,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index cfee25b0260328dfc01a22a8a906ff29f972b7be..8883d1cadfa2d9a9bf6b6187e89e15319c2d50a8 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -12,7 +12,7 @@
         - 'packetcable-distribution-{stream}'
         - 'packetcable-integration-{stream}'
         - 'packetcable-sonar'
         - 'packetcable-distribution-{stream}'
         - 'packetcable-integration-{stream}'
         - 'packetcable-sonar'

-        - 'packetcable-clm'
+        - 'packetcable-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'packetcable-clm'
+    name: 'packetcable-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 5f73797430c74e1d2449003e4256f247cd3c0cfa..ea69389850e9642560ca6a4e5e4adf1daefabc40 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -12,7 +12,7 @@
         - 'persistence-distribution-{stream}'
         - 'persistence-integration-{stream}'
         - 'persistence-sonar'
         - 'persistence-distribution-{stream}'
         - 'persistence-integration-{stream}'
         - 'persistence-sonar'

-        - 'persistence-clm'
+        - 'persistence-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -417,11 +417,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'persistence-clm'
+    name: 'persistence-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -437,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index b7b589ce145343b2e25dcfc2c347d6db6cb715a1..61ea3c2a06be877605349ba8f9fbfc124927cbad 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -12,7 +12,7 @@
         - 'reservation-distribution-{stream}'
         - 'reservation-integration-{stream}'
         - 'reservation-sonar'
         - 'reservation-distribution-{stream}'
         - 'reservation-integration-{stream}'
         - 'reservation-sonar'

-        - 'reservation-clm'
+        - 'reservation-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -415,11 +415,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'reservation-clm'
+    name: 'reservation-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -435,7 +435,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index e1ab33957913f2c7e64b37f71dedc572c1dd3432..018fa16f07e82a74e50ab3b4f8af3c96ab755362 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -12,7 +12,7 @@
         - 'sdninterfaceapp-distribution-{stream}'
         - 'sdninterfaceapp-integration-{stream}'
         - 'sdninterfaceapp-sonar'
         - 'sdninterfaceapp-distribution-{stream}'
         - 'sdninterfaceapp-integration-{stream}'
         - 'sdninterfaceapp-sonar'

-        - 'sdninterfaceapp-clm'
+        - 'sdninterfaceapp-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -422,11 +422,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'sdninterfaceapp-clm'
+    name: 'sdninterfaceapp-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -442,7 +442,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index dd589e6519ace59c7726211a42051b5eae896483..f98af5299a33342cd61a04c6abbfa0d431976bfd 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -12,7 +12,7 @@
         - 'sfc-distribution-{stream}'
         - 'sfc-integration-{stream}'
         - 'sfc-sonar'
         - 'sfc-distribution-{stream}'
         - 'sfc-integration-{stream}'
         - 'sfc-sonar'

-        - 'sfc-clm'
+        - 'sfc-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'sfc-clm'
+    name: 'sfc-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 5890e6889ee8c5af3ec487e2706139fef87c35d4..1e57b92dd9a28588fcd7c7b0f34f1c402655c622 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -12,7 +12,7 @@
         - 'snbi-distribution-{stream}'
         - 'snbi-integration-{stream}'
         - 'snbi-sonar'
         - 'snbi-distribution-{stream}'
         - 'snbi-integration-{stream}'
         - 'snbi-sonar'

-        - 'snbi-clm'
+        - 'snbi-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'snbi-clm'
+    name: 'snbi-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 3bd0462d2b4d9b5ceb176126d4dfd836cff90c0b..498f26d42bc2d9776aa91a77efe81aadbc126e8e 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -12,7 +12,7 @@
         - 'snmp-distribution-{stream}'
         - 'snmp-integration-{stream}'
         - 'snmp-sonar'
         - 'snmp-distribution-{stream}'
         - 'snmp-integration-{stream}'
         - 'snmp-sonar'

-        - 'snmp-clm'
+        - 'snmp-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -415,11 +415,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'snmp-clm'
+    name: 'snmp-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -435,7 +435,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 19159be5cf3dfdb8d0aba5f3db00a2f9029cafe8..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-distribution-{stream}'
         - 'snmp4sdn-integration-{stream}'
         - 'snmp4sdn-sonar'

-        - 'snmp4sdn-clm'
+        - 'snmp4sdn-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'snmp4sdn-clm'
+    name: 'snmp4sdn-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 07c9effc47bfc36f517340823da99992c5a0c205..ac3ff6d9a0779467ac2e4a21e791d7e2d27c62c1 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -12,7 +12,7 @@
         - 'sxp-distribution-{stream}'
         - 'sxp-integration-{stream}'
         - 'sxp-sonar'
         - 'sxp-distribution-{stream}'
         - 'sxp-integration-{stream}'
         - 'sxp-sonar'

-        - 'sxp-clm'
+        - 'sxp-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'sxp-clm'
+    name: 'sxp-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml
index 55b78e3e03f7d052ee34dfcb276335bf4dd95d7a..61af954cae4ac9722fd98f0dfdfdba1a71c9b329 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.yaml
+++ b/jjb/tcpmd5/tcpmd5.yaml
@@ -12,7 +12,7 @@
         - 'tcpmd5-distribution-{stream}'
         - 'tcpmd5-integration-{stream}'
         - 'tcpmd5-sonar'
         - 'tcpmd5-distribution-{stream}'
         - 'tcpmd5-integration-{stream}'
         - 'tcpmd5-sonar'

-        - 'tcpmd5-clm'
+        - 'tcpmd5-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -422,11 +422,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'tcpmd5-clm'
+    name: 'tcpmd5-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -442,7 +442,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/toolkit/toolkit.yaml b/jjb/toolkit/toolkit.yaml
index f55286306e84ca817f80611c98282ff7027bfb4c..edfda4997c285b364245a74c63800b9dd2a9ec00 100644 (file)
--- a/jjb/toolkit/toolkit.yaml
+++ b/jjb/toolkit/toolkit.yaml
@@ -12,7 +12,7 @@
         - 'toolkit-distribution-{stream}'
         - 'toolkit-integration-{stream}'
         - 'toolkit-sonar'
         - 'toolkit-distribution-{stream}'
         - 'toolkit-integration-{stream}'
         - 'toolkit-sonar'

-        - 'toolkit-clm'
+        - 'toolkit-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -410,11 +410,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'toolkit-clm'
+    name: 'toolkit-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -430,7 +430,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 91fc3bb149ed6f37d9956ab55eaeb1924bf9bb5d..00baaa3f1ab7a83fb0ff6ad21e5adc6d8587d7c0 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -12,7 +12,7 @@
         - 'topoprocessing-distribution-{stream}'
         - 'topoprocessing-integration-{stream}'
         - 'topoprocessing-sonar'
         - 'topoprocessing-distribution-{stream}'
         - 'topoprocessing-integration-{stream}'
         - 'topoprocessing-sonar'

-        - 'topoprocessing-clm'
+        - 'topoprocessing-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -417,11 +417,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'topoprocessing-clm'
+    name: 'topoprocessing-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -437,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 07545e0eb89458a848eeeab093a0a24460e9b68a..db5bf041ab8a07db76232db7256a7a17a3fa2ce8 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -12,7 +12,7 @@
         - 'tsdr-distribution-{stream}'
         - 'tsdr-integration-{stream}'
         - 'tsdr-sonar'
         - 'tsdr-distribution-{stream}'
         - 'tsdr-integration-{stream}'
         - 'tsdr-sonar'

-        - 'tsdr-clm'
+        - 'tsdr-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -415,11 +415,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'tsdr-clm'
+    name: 'tsdr-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -435,7 +435,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 1a3bf17f37f8541f00bb4c1f3bf647c9b79fdbcb..bb8f46c7550702e5a469208eee0bdd51b6e363fb 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -12,7 +12,7 @@
         - 'ttp-distribution-{stream}'
         - 'ttp-integration-{stream}'
         - 'ttp-sonar'
         - 'ttp-distribution-{stream}'
         - 'ttp-integration-{stream}'
         - 'ttp-sonar'

-        - 'ttp-clm'
+        - 'ttp-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -420,11 +420,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'ttp-clm'
+    name: 'ttp-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -440,7 +440,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 7234552cec0104b5a725eed67d4e82df50153bb2..4d7d0963146cd346be12831d3e5a94acf4eae9d4 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -12,7 +12,7 @@
         - 'usc-distribution-{stream}'
         - 'usc-integration-{stream}'
         - 'usc-sonar'
         - 'usc-distribution-{stream}'
         - 'usc-integration-{stream}'
         - 'usc-sonar'

-        - 'usc-clm'
+        - 'usc-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -417,11 +417,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'usc-clm'
+    name: 'usc-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -437,7 +437,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 2078a17f2814d8a9e709e8a0ac1432f1f110e7e8..15e12f4a967a45363e499939435b473ab5f259d1 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -12,7 +12,7 @@
         - 'vpnservice-distribution-{stream}'
         - 'vpnservice-integration-{stream}'
         - 'vpnservice-sonar'
         - 'vpnservice-distribution-{stream}'
         - 'vpnservice-integration-{stream}'
         - 'vpnservice-sonar'

-        - 'vpnservice-clm'
+        - 'vpnservice-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -415,11 +415,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'vpnservice-clm'
+    name: 'vpnservice-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -435,7 +435,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 07d5cd2023449213b40c0a8d9a1add8730b1f53b..84248d0beabfbd49037ac2d2c9fff8743d880098 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -12,7 +12,7 @@
         - 'vtn-distribution-{stream}'
         - 'vtn-integration-{stream}'
         - 'vtn-sonar'
         - 'vtn-distribution-{stream}'
         - 'vtn-integration-{stream}'
         - 'vtn-sonar'

-        - 'vtn-clm'
+        - 'vtn-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -422,11 +422,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'vtn-clm'
+    name: 'vtn-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -442,7 +442,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index fe5d3cc106b5ab4433d6bf1461f1dbb8c843ead8..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-distribution-{stream}'
         - 'yangtools-integration-{stream}'
         - 'yangtools-sonar'

-        - 'yangtools-clm'
+        - 'yangtools-clm-{stream}'

 
 
     # stream:    branch with - in place of / (eg. stable-helium)
 
 
     # stream:    branch with - in place of / (eg. stable-helium)


@@ -349,11 +349,11 @@
         - jacoco-report
 
 - job-template:
         - jacoco-report
 
 - job-template:

-    name: 'yangtools-clm'
+    name: 'yangtools-clm-{stream}'

 
     project-type: maven
     node: dynamic_verify
 
     project-type: maven
     node: dynamic_verify

-    jdk: 'openjdk7'
+    jdk: '{jdk}'

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -369,7 +369,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''

-            branch: 'master'
+            branch: '{branch}'

 
     wrappers:
         - build-timeout
 
     wrappers:
         - build-timeout