Move distribution template to releng 52/20552/4
authorThanh Ha <thanh.ha@linuxfoundation.org>
Fri, 15 May 2015 18:11:32 +0000 (14:11 -0400)
committerThanh Ha <thanh.ha@linuxfoundation.org>
Fri, 15 May 2015 18:34:56 +0000 (14:34 -0400)
Change-Id: I2b268129eedf6480e562547379f59b603b9594c1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
63 files changed:
jjb-templates/distribution.yaml [new file with mode: 0644]
jjb/aaa/aaa-distribution.yaml [deleted file]
jjb/aaa/aaa.yaml
jjb/alto/alto.yaml
jjb/bgpcep/bgpcep-distribution.yaml [deleted file]
jjb/bgpcep/bgpcep.yaml
jjb/capwap/capwap.yaml
jjb/controller/controller-distribution.yaml [deleted file]
jjb/controller/controller.cfg
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/defense4all/defense4all.yaml
jjb/didm/didm.yaml
jjb/discovery/discovery.yaml
jjb/dlux/dlux.yaml
jjb/docs/docs.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/integration/integration-templates.yaml
jjb/iotdm/iotdm-distribution.yaml [deleted file]
jjb/iotdm/iotdm.yaml
jjb/l2switch/l2switch-distribution.yaml [deleted file]
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-distribution.yaml [deleted file]
jjb/lacp/lacp.yaml
jjb/lispflowmapping/lispflowmapping-distribution.yaml [deleted file]
jjb/lispflowmapping/lispflowmapping.yaml
jjb/neutron/neutron.yaml
jjb/nic/nic.yaml
jjb/odlparent/odlparent.yaml
jjb/openflowjava/openflowjava-distribution.yaml [deleted file]
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-distribution.yaml [deleted file]
jjb/openflowplugin/openflowplugin.yaml
jjb/ovsdb/ovsdb-distribution.yaml [deleted file]
jjb/ovsdb/ovsdb.cfg
jjb/ovsdb/ovsdb.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp-distribution.yaml [deleted file]
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp.yaml
jjb/tcpmd5/tcpmd5-distribution.yaml [deleted file]
jjb/tcpmd5/tcpmd5.yaml
jjb/toolkit/toolkit.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/tsdr/tsdr-distribution.yaml [deleted file]
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/usc/usc-distribution.yaml [deleted file]
jjb/usc/usc.yaml
jjb/vpnservice/vpnservice-distribution.yaml [deleted file]
jjb/vpnservice/vpnservice.yaml
jjb/vtn/vtn-distribution.yaml [deleted file]
jjb/vtn/vtn.yaml
jjb/yangtools/yangtools-distribution.yaml [deleted file]
jjb/yangtools/yangtools.cfg
jjb/yangtools/yangtools.yaml
scripts/jjb-init-project.py

diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
new file mode 100644 (file)
index 0000000..a6067b9
--- /dev/null
@@ -0,0 +1,52 @@
+- job-template:
+    name: 'PROJECT-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
diff --git a/jjb/aaa/aaa-distribution.yaml b/jjb/aaa/aaa-distribution.yaml
deleted file mode 100644 (file)
index 707e563..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: aaa-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'aaa'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 4eac939c8e27e90ed3b728673f0f06040bac6d73..2f3bc0b00033c5a7a0f1cdcefb145959d2223991 100644 (file)
@@ -9,6 +9,7 @@
         - 'aaa-verify-{stream}'
         - 'aaa-merge-{stream}'
         - 'aaa-daily-{stream}'
+        - 'aaa-distribution-{stream}'
         - 'aaa-integration-{stream}'
         - 'aaa-sonar'
         - 'aaa-clm'
             email-prefix: '[aaa]'
         - jacoco-report
 
+- job-template:
+    name: 'aaa-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'aaa-integration-{stream}'
     disabled: false
index 6bf610fe2f3fdcaca6d7bfd0c78194737eaf38d0..156d6dcacdf09b651a0430b95f726e6e751412a4 100644 (file)
@@ -9,6 +9,7 @@
         - 'alto-verify-{stream}'
         - 'alto-merge-{stream}'
         - 'alto-daily-{stream}'
+        - 'alto-distribution-{stream}'
         - 'alto-integration-{stream}'
         - 'alto-sonar'
         - 'alto-clm'
             email-prefix: '[alto]'
         - jacoco-report
 
+- job-template:
+    name: 'alto-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'alto-integration-{stream}'
     disabled: false
diff --git a/jjb/bgpcep/bgpcep-distribution.yaml b/jjb/bgpcep/bgpcep-distribution.yaml
deleted file mode 100644 (file)
index db4b6d2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: bgpcep-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'bgpcep'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 04bd3ad92d4fdfa77d3eb33ad31b3d8cbe58ceb0..48a732db4133518b1503c7b9587e31fbe3c7e0a3 100644 (file)
@@ -9,6 +9,7 @@
         - 'bgpcep-verify-{stream}'
         - 'bgpcep-merge-{stream}'
         - 'bgpcep-daily-{stream}'
+        - 'bgpcep-distribution-{stream}'
         - 'bgpcep-integration-{stream}'
         - 'bgpcep-sonar'
         - 'bgpcep-clm'
             email-prefix: '[bgpcep]'
         - jacoco-report
 
+- job-template:
+    name: 'bgpcep-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'bgpcep-integration-{stream}'
     disabled: false
index ed6a195efc79a761e192cad4d3b0f3b86f37e19b..a4c4feea12df469af2bf2b9a6f96370a6d7a4f19 100644 (file)
@@ -9,6 +9,7 @@
         - 'capwap-verify-{stream}'
         - 'capwap-merge-{stream}'
         - 'capwap-daily-{stream}'
+        - 'capwap-distribution-{stream}'
         - 'capwap-integration-{stream}'
         - 'capwap-sonar'
         - 'capwap-clm'
             email-prefix: '[capwap]'
         - jacoco-report
 
+- job-template:
+    name: 'capwap-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'capwap-integration-{stream}'
     disabled: false
diff --git a/jjb/controller/controller-distribution.yaml b/jjb/controller/controller-distribution.yaml
deleted file mode 100644 (file)
index efee9d4..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: controller-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'controller'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 66124c945e633aa083403691a5b32f774d7cd268..463063a944b290194efba643eee9cf30eaab459e 100644 (file)
@@ -1,4 +1,4 @@
-JOB_TEMPLATES: merge,daily,integration,sonar
+JOB_TEMPLATES: merge,daily,distribution,integration,sonar
 BRANCHES:
 - master:
     jdks: openjdk7,openjdk8
index 31641f8f02514eb7c65b01dad323c865b11be2b0..ee1fc6ea429bdc41548c2f8d0544f725f3503614 100644 (file)
@@ -8,6 +8,7 @@
     jobs:
         - 'controller-merge-{stream}'
         - 'controller-daily-{stream}'
+        - 'controller-distribution-{stream}'
         - 'controller-integration-{stream}'
         - 'controller-sonar'
         - 'controller-clm'
             email-prefix: '[controller]'
         - jacoco-report
 
+- job-template:
+    name: 'controller-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'controller-integration-{stream}'
     disabled: false
index 86d1c79f8fec7ad0248a73d70cec525e1feb593e..7cdf806721b1079baa209e3f2e665f0a517b7786 100644 (file)
@@ -9,6 +9,7 @@
         - 'coretutorials-verify-{stream}'
         - 'coretutorials-merge-{stream}'
         - 'coretutorials-daily-{stream}'
+        - 'coretutorials-distribution-{stream}'
         - 'coretutorials-integration-{stream}'
         - 'coretutorials-sonar'
         - 'coretutorials-clm'
             email-prefix: '[coretutorials]'
         - jacoco-report
 
+- job-template:
+    name: 'coretutorials-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'coretutorials-integration-{stream}'
     disabled: false
index eb65471d37b3fdb903d798cc704d5bde3fd6b572..293f24d21eed20866992ea2f10babe2920975dbf 100644 (file)
@@ -9,6 +9,7 @@
         - 'defense4all-verify-{stream}'
         - 'defense4all-merge-{stream}'
         - 'defense4all-daily-{stream}'
+        - 'defense4all-distribution-{stream}'
         - 'defense4all-integration-{stream}'
         - 'defense4all-sonar'
         - 'defense4all-clm'
             email-prefix: '[defense4all]'
         - jacoco-report
 
+- job-template:
+    name: 'defense4all-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'defense4all-integration-{stream}'
     disabled: false
index 3fe1b58d82977b48d869cee5dcc7badcfb41c974..0ec12aa0ca256da46ddfc2d741edb5aaa1f4cc31 100644 (file)
@@ -9,6 +9,7 @@
         - 'didm-verify-{stream}'
         - 'didm-merge-{stream}'
         - 'didm-daily-{stream}'
+        - 'didm-distribution-{stream}'
         - 'didm-integration-{stream}'
         - 'didm-sonar'
         - 'didm-clm'
             email-prefix: '[didm]'
         - jacoco-report
 
+- job-template:
+    name: 'didm-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'didm-integration-{stream}'
     disabled: false
index 6ddcb60bd91d3edc5062c13492949fb53f8b5f25..4c87d8a603a58be7893242022e93caee786a8661 100644 (file)
@@ -9,6 +9,7 @@
         - 'discovery-verify-{stream}'
         - 'discovery-merge-{stream}'
         - 'discovery-daily-{stream}'
+        - 'discovery-distribution-{stream}'
         - 'discovery-integration-{stream}'
         - 'discovery-sonar'
         - 'discovery-clm'
             email-prefix: '[discovery]'
         - jacoco-report
 
+- job-template:
+    name: 'discovery-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'discovery-integration-{stream}'
     disabled: false
index 6c5fdfb6c14ea005eeb1e5506d9bfd757900bdd8..ee835040da3b43bbc787da5ebcd30eefbcab16ce 100644 (file)
@@ -9,6 +9,7 @@
         - 'dlux-verify-{stream}'
         - 'dlux-merge-{stream}'
         - 'dlux-daily-{stream}'
+        - 'dlux-distribution-{stream}'
         - 'dlux-integration-{stream}'
         - 'dlux-sonar'
         - 'dlux-clm'
             email-prefix: '[dlux]'
         - jacoco-report
 
+- job-template:
+    name: 'dlux-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'dlux-integration-{stream}'
     disabled: false
index 702a9f440df1ffb3f81b63d6d32ca35c59e22f88..6ff3a6481bb2a984d451cdb21f0df4a38fc95337 100644 (file)
@@ -9,6 +9,7 @@
         - 'docs-verify-{stream}'
         - 'docs-merge-{stream}'
         - 'docs-daily-{stream}'
+        - 'docs-distribution-{stream}'
         - 'docs-integration-{stream}'
         - 'docs-sonar'
         - 'docs-clm'
             email-prefix: '[docs]'
         - jacoco-report
 
+- job-template:
+    name: 'docs-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'docs-integration-{stream}'
     disabled: false
index 6dc2c8dc77347ea7bf013a1e8e5dccc8ee5eceef..67dfd237788270054e7d14772e0e762310871e32 100644 (file)
@@ -9,6 +9,7 @@
         - 'groupbasedpolicy-verify-{stream}'
         - 'groupbasedpolicy-merge-{stream}'
         - 'groupbasedpolicy-daily-{stream}'
+        - 'groupbasedpolicy-distribution-{stream}'
         - 'groupbasedpolicy-integration-{stream}'
         - 'groupbasedpolicy-sonar'
         - 'groupbasedpolicy-clm'
             email-prefix: '[groupbasedpolicy]'
         - jacoco-report
 
+- job-template:
+    name: 'groupbasedpolicy-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'groupbasedpolicy-integration-{stream}'
     disabled: false
index 2fc2607411053e51f57e1d040e2febc783a06e18..7c8cd4f1ab444498c4d45100d92a5e1317ee909b 100644 (file)
@@ -1,56 +1,3 @@
-- job-template:
-    name: '{project}-distribution-{stream}'
-
-    project-type: maven
-    node: dynamic_merge
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: 'integration'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - reverse:
-            jobs: '{project}-merge-{stream}'
-            result: 'success'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-
-    maven:
-        maven-name: '{mvn32}'
-        root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{integration-settings}'
-        global-settings: '{odl-global-settings}'
-
-    publishers:
-        - email-notification:
-            email-prefix: '[{project}]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
-
 - job-template:
     name: '{project}-csit-verify-{functionality}-{stream}'
 
diff --git a/jjb/iotdm/iotdm-distribution.yaml b/jjb/iotdm/iotdm-distribution.yaml
deleted file mode 100644 (file)
index 08e9cac..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: iotdm-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'iotdm'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-
-    jdk: 'openjdk7'
-
index f5679f19c1d7893c9438332e524e682e0473db2b..dd022b42247401f7ee0e9c6df1a5212382877ed2 100644 (file)
@@ -9,6 +9,7 @@
         - 'iotdm-verify-{stream}'
         - 'iotdm-merge-{stream}'
         - 'iotdm-daily-{stream}'
+        - 'iotdm-distribution-{stream}'
         - 'iotdm-integration-{stream}'
         - 'iotdm-sonar'
         - 'iotdm-clm'
             email-prefix: '[iotdm]'
         - jacoco-report
 
+- job-template:
+    name: 'iotdm-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'iotdm-integration-{stream}'
     disabled: false
diff --git a/jjb/l2switch/l2switch-distribution.yaml b/jjb/l2switch/l2switch-distribution.yaml
deleted file mode 100644 (file)
index 4fb15e9..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: l2switch-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'l2switch'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index ac1c8d352dc5e84c303e7fc7560231376d18b64e..f874eb86053218c600056105e1cdc67cda1373c1 100644 (file)
@@ -9,6 +9,7 @@
         - 'l2switch-verify-{stream}'
         - 'l2switch-merge-{stream}'
         - 'l2switch-daily-{stream}'
+        - 'l2switch-distribution-{stream}'
         - 'l2switch-integration-{stream}'
         - 'l2switch-sonar'
         - 'l2switch-clm'
             email-prefix: '[l2switch]'
         - jacoco-report
 
+- job-template:
+    name: 'l2switch-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'l2switch-integration-{stream}'
     disabled: false
diff --git a/jjb/lacp/lacp-distribution.yaml b/jjb/lacp/lacp-distribution.yaml
deleted file mode 100644 (file)
index a1191b3..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: lacp-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'lacp'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-
-    jdk: 'openjdk7'
-
index a7b65ea7b494cbde23744d51bdf35dbee7896244..72e1ebd0caa550c69a6395f22996c59f8a59a9f0 100644 (file)
@@ -9,6 +9,7 @@
         - 'lacp-verify-{stream}'
         - 'lacp-merge-{stream}'
         - 'lacp-daily-{stream}'
+        - 'lacp-distribution-{stream}'
         - 'lacp-integration-{stream}'
         - 'lacp-sonar'
         - 'lacp-clm'
             email-prefix: '[lacp]'
         - jacoco-report
 
+- job-template:
+    name: 'lacp-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'lacp-integration-{stream}'
     disabled: false
diff --git a/jjb/lispflowmapping/lispflowmapping-distribution.yaml b/jjb/lispflowmapping/lispflowmapping-distribution.yaml
deleted file mode 100644 (file)
index 7e963a3..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: lispflowmapping-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'lispflowmapping'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index c9cee461719a5f519eea34601803feb91d80143a..f4299fa29758d5ca5a52073d30aeeef2379be49c 100644 (file)
@@ -9,6 +9,7 @@
         - 'lispflowmapping-verify-{stream}'
         - 'lispflowmapping-merge-{stream}'
         - 'lispflowmapping-daily-{stream}'
+        - 'lispflowmapping-distribution-{stream}'
         - 'lispflowmapping-integration-{stream}'
         - 'lispflowmapping-sonar'
         - 'lispflowmapping-clm'
             email-prefix: '[lispflowmapping]'
         - jacoco-report
 
+- job-template:
+    name: 'lispflowmapping-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'lispflowmapping-integration-{stream}'
     disabled: false
index 8d3d25f1f9185676dfe8a650f0b2f9d66fea9e06..6edf7f0da64a045392ff3ab5b3037575fb2ae2c2 100644 (file)
@@ -9,6 +9,7 @@
         - 'neutron-verify-{stream}'
         - 'neutron-merge-{stream}'
         - 'neutron-daily-{stream}'
+        - 'neutron-distribution-{stream}'
         - 'neutron-integration-{stream}'
         - 'neutron-sonar'
         - 'neutron-clm'
             email-prefix: '[neutron]'
         - jacoco-report
 
+- job-template:
+    name: 'neutron-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'neutron-integration-{stream}'
     disabled: false
index 82fa188a845a273df40e22ced91c3202c89abb6b..17ae9a9db49e0176664ebb0270bfbbc85deeb1b9 100644 (file)
@@ -9,6 +9,7 @@
         - 'nic-verify-{stream}'
         - 'nic-merge-{stream}'
         - 'nic-daily-{stream}'
+        - 'nic-distribution-{stream}'
         - 'nic-integration-{stream}'
         - 'nic-sonar'
         - 'nic-clm'
             email-prefix: '[nic]'
         - jacoco-report
 
+- job-template:
+    name: 'nic-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'nic-integration-{stream}'
     disabled: false
index 5a47082b421e923a7219cdaea36517711f37df4b..6cda022c0c28d79a53a98c89a81ee4f0ed7fd9e4 100644 (file)
@@ -9,6 +9,7 @@
         - 'odlparent-verify-{stream}'
         - 'odlparent-merge-{stream}'
         - 'odlparent-daily-{stream}'
+        - 'odlparent-distribution-{stream}'
         - 'odlparent-integration-{stream}'
         - 'odlparent-sonar'
         - 'odlparent-clm'
             email-prefix: '[odlparent]'
         - jacoco-report
 
+- job-template:
+    name: 'odlparent-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'odlparent-integration-{stream}'
     disabled: false
diff --git a/jjb/openflowjava/openflowjava-distribution.yaml b/jjb/openflowjava/openflowjava-distribution.yaml
deleted file mode 100644 (file)
index e6428cb..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: openflowjava-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'openflowjava'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 83d40aea529c56377255f0712069ca3bc01d5d40..bcc4d60d2794b83c614de72e43c32d583eea76fb 100644 (file)
@@ -9,6 +9,7 @@
         - 'openflowjava-verify-{stream}'
         - 'openflowjava-merge-{stream}'
         - 'openflowjava-daily-{stream}'
+        - 'openflowjava-distribution-{stream}'
         - 'openflowjava-integration-{stream}'
         - 'openflowjava-sonar'
         - 'openflowjava-clm'
             email-prefix: '[openflowjava]'
         - jacoco-report
 
+- job-template:
+    name: 'openflowjava-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'openflowjava-integration-{stream}'
     disabled: false
diff --git a/jjb/openflowplugin/openflowplugin-distribution.yaml b/jjb/openflowplugin/openflowplugin-distribution.yaml
deleted file mode 100644 (file)
index 5785ec6..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: openflowplugin-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 2bd0fe166a578f07a513c1782e0d777143b73b69..6cc87e4e15d54689cb9fa38e664290dad44480b3 100644 (file)
@@ -9,6 +9,7 @@
         - 'openflowplugin-verify-{stream}'
         - 'openflowplugin-merge-{stream}'
         - 'openflowplugin-daily-{stream}'
+        - 'openflowplugin-distribution-{stream}'
         - 'openflowplugin-integration-{stream}'
         - 'openflowplugin-sonar'
         - 'openflowplugin-clm'
             email-prefix: '[openflowplugin]'
         - jacoco-report
 
+- job-template:
+    name: 'openflowplugin-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'openflowplugin-integration-{stream}'
     disabled: false
diff --git a/jjb/ovsdb/ovsdb-distribution.yaml b/jjb/ovsdb/ovsdb-distribution.yaml
deleted file mode 100644 (file)
index 2a0ffa2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: ovsdb-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'ovsdb'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index b6f2f891648d3b496bf074288b0e1a9ad001127d..1d1f2e05ee04f0bd0ce09d8b78335456f39e3a41 100644 (file)
@@ -6,4 +6,4 @@ BRANCHES:
 - stable/lithium:
     jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,neutron
-JOB_TEMPLATES: verify,merge,daily,integration
+JOB_TEMPLATES: verify,merge,daily,distribution,integration
index ffdbadaaa56aeb8a663d8710b55b82553ef885fc..68343abd8dfc7a792ebebb02aeb947667beb758c 100644 (file)
@@ -9,6 +9,7 @@
         - 'ovsdb-verify-{stream}'
         - 'ovsdb-merge-{stream}'
         - 'ovsdb-daily-{stream}'
+        - 'ovsdb-distribution-{stream}'
         - 'ovsdb-integration-{stream}'
         - 'ovsdb-clm'
 
             email-prefix: '[ovsdb]'
         - jacoco-report
 
+- job-template:
+    name: 'ovsdb-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'ovsdb-integration-{stream}'
     disabled: false
index 091861ba95903dfde1bb50c8ed961ba8f5839bf0..b566ec9d383b9f8c49e8fbf59ea5df9f5fbf6334 100644 (file)
@@ -9,6 +9,7 @@
         - 'packetcable-verify-{stream}'
         - 'packetcable-merge-{stream}'
         - 'packetcable-daily-{stream}'
+        - 'packetcable-distribution-{stream}'
         - 'packetcable-integration-{stream}'
         - 'packetcable-sonar'
         - 'packetcable-clm'
             email-prefix: '[packetcable]'
         - jacoco-report
 
+- job-template:
+    name: 'packetcable-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'packetcable-integration-{stream}'
     disabled: false
index 3c65ceceacb662c92ccbd681cdd891ffd4480ee3..c4bcf52ba5cd0702a2895a4ddd76f498245ce00c 100644 (file)
@@ -9,6 +9,7 @@
         - 'persistence-verify-{stream}'
         - 'persistence-merge-{stream}'
         - 'persistence-daily-{stream}'
+        - 'persistence-distribution-{stream}'
         - 'persistence-integration-{stream}'
         - 'persistence-sonar'
         - 'persistence-clm'
             email-prefix: '[persistence]'
         - jacoco-report
 
+- job-template:
+    name: 'persistence-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'persistence-integration-{stream}'
     disabled: false
index e6748f8741a9541f684544532db725299502db30..568c7816864ac255d52f86285c72a24cfad3920d 100644 (file)
@@ -9,6 +9,7 @@
         - 'reservation-verify-{stream}'
         - 'reservation-merge-{stream}'
         - 'reservation-daily-{stream}'
+        - 'reservation-distribution-{stream}'
         - 'reservation-integration-{stream}'
         - 'reservation-sonar'
         - 'reservation-clm'
             email-prefix: '[reservation]'
         - jacoco-report
 
+- job-template:
+    name: 'reservation-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'reservation-integration-{stream}'
     disabled: false
index 8939a09e7f918ece706e4864a30ff2164fcf81d7..ce6ba1389e07b355815bc6b1c487a9bcdfbe8c99 100644 (file)
@@ -9,6 +9,7 @@
         - 'sdninterfaceapp-verify-{stream}'
         - 'sdninterfaceapp-merge-{stream}'
         - 'sdninterfaceapp-daily-{stream}'
+        - 'sdninterfaceapp-distribution-{stream}'
         - 'sdninterfaceapp-integration-{stream}'
         - 'sdninterfaceapp-sonar'
         - 'sdninterfaceapp-clm'
             email-prefix: '[sdninterfaceapp]'
         - jacoco-report
 
+- job-template:
+    name: 'sdninterfaceapp-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'sdninterfaceapp-integration-{stream}'
     disabled: false
index c9198b02471c8d2fe5b40823fcbf4c564a83abbe..30d90d95dcbeb65cf463e18e8564f6ac8080ece9 100644 (file)
@@ -9,6 +9,7 @@
         - 'sfc-verify-{stream}'
         - 'sfc-merge-{stream}'
         - 'sfc-daily-{stream}'
+        - 'sfc-distribution-{stream}'
         - 'sfc-integration-{stream}'
         - 'sfc-sonar'
         - 'sfc-clm'
             email-prefix: '[sfc]'
         - jacoco-report
 
+- job-template:
+    name: 'sfc-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'sfc-integration-{stream}'
     disabled: false
index 7825cdc730b35c2c9c87cf0e72f49428a509958f..953a79bcb33ce5edec6215dabc7b97b081786129 100644 (file)
@@ -9,6 +9,7 @@
         - 'snbi-verify-{stream}'
         - 'snbi-merge-{stream}'
         - 'snbi-daily-{stream}'
+        - 'snbi-distribution-{stream}'
         - 'snbi-integration-{stream}'
         - 'snbi-sonar'
         - 'snbi-clm'
             email-prefix: '[snbi]'
         - jacoco-report
 
+- job-template:
+    name: 'snbi-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'snbi-integration-{stream}'
     disabled: false
diff --git a/jjb/snmp/snmp-distribution.yaml b/jjb/snmp/snmp-distribution.yaml
deleted file mode 100644 (file)
index b6f87d7..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: snmp-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'snmp'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-
-    jdk: 'openjdk7'
-
index 197dab81808a40012fce87a08399484ccdfe23f7..b083316d0268c8dd5b37f416f36a789b8055075f 100644 (file)
@@ -9,6 +9,7 @@
         - 'snmp-verify-{stream}'
         - 'snmp-merge-{stream}'
         - 'snmp-daily-{stream}'
+        - 'snmp-distribution-{stream}'
         - 'snmp-integration-{stream}'
         - 'snmp-sonar'
         - 'snmp-clm'
             email-prefix: '[snmp]'
         - jacoco-report
 
+- job-template:
+    name: 'snmp-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'snmp-integration-{stream}'
     disabled: false
index de69b86e2e2f1d3285fdb93c4c20dc183f5e46cc..1b02d0d248abe927445d39c25406182796c75fa5 100644 (file)
@@ -9,6 +9,7 @@
         - 'snmp4sdn-verify-{stream}'
         - 'snmp4sdn-merge-{stream}'
         - 'snmp4sdn-daily-{stream}'
+        - 'snmp4sdn-distribution-{stream}'
         - 'snmp4sdn-integration-{stream}'
         - 'snmp4sdn-sonar'
         - 'snmp4sdn-clm'
             email-prefix: '[snmp4sdn]'
         - jacoco-report
 
+- job-template:
+    name: 'snmp4sdn-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'snmp4sdn-integration-{stream}'
     disabled: false
index 860e8ef4838082c65cb02c9a14114f53c15d159c..6bce00996d673debd0dbecf253d789b9be8892a8 100644 (file)
@@ -9,6 +9,7 @@
         - 'sxp-verify-{stream}'
         - 'sxp-merge-{stream}'
         - 'sxp-daily-{stream}'
+        - 'sxp-distribution-{stream}'
         - 'sxp-integration-{stream}'
         - 'sxp-sonar'
         - 'sxp-clm'
             email-prefix: '[sxp]'
         - jacoco-report
 
+- job-template:
+    name: 'sxp-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'sxp-integration-{stream}'
     disabled: false
diff --git a/jjb/tcpmd5/tcpmd5-distribution.yaml b/jjb/tcpmd5/tcpmd5-distribution.yaml
deleted file mode 100644 (file)
index d98b313..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: tcpmd5-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'tcpmd5'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 7cc5864d26c24c362f1c557fadff444d18727db1..9673edfbd3b0e4ceb5d39e0f81769a15d5b274f4 100644 (file)
@@ -9,6 +9,7 @@
         - 'tcpmd5-verify-{stream}'
         - 'tcpmd5-merge-{stream}'
         - 'tcpmd5-daily-{stream}'
+        - 'tcpmd5-distribution-{stream}'
         - 'tcpmd5-integration-{stream}'
         - 'tcpmd5-sonar'
         - 'tcpmd5-clm'
             email-prefix: '[tcpmd5]'
         - jacoco-report
 
+- job-template:
+    name: 'tcpmd5-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'tcpmd5-integration-{stream}'
     disabled: false
index 92a9249a226f63c2f204107467971900487d92bf..75d8dad709b620e423b9723aced5f7ba09066c55 100644 (file)
@@ -9,6 +9,7 @@
         - 'toolkit-verify-{stream}'
         - 'toolkit-merge-{stream}'
         - 'toolkit-daily-{stream}'
+        - 'toolkit-distribution-{stream}'
         - 'toolkit-integration-{stream}'
         - 'toolkit-sonar'
         - 'toolkit-clm'
             email-prefix: '[toolkit]'
         - jacoco-report
 
+- job-template:
+    name: 'toolkit-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'toolkit-integration-{stream}'
     disabled: false
index 4112382f486c6a0c383b662369f81a5046b2841c..85d26c792a1aeac0c640e43546b23ff110056c7b 100644 (file)
@@ -9,6 +9,7 @@
         - 'topoprocessing-verify-{stream}'
         - 'topoprocessing-merge-{stream}'
         - 'topoprocessing-daily-{stream}'
+        - 'topoprocessing-distribution-{stream}'
         - 'topoprocessing-integration-{stream}'
         - 'topoprocessing-sonar'
         - 'topoprocessing-clm'
             email-prefix: '[topoprocessing]'
         - jacoco-report
 
+- job-template:
+    name: 'topoprocessing-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'topoprocessing-integration-{stream}'
     disabled: false
diff --git a/jjb/tsdr/tsdr-distribution.yaml b/jjb/tsdr/tsdr-distribution.yaml
deleted file mode 100644 (file)
index 952364d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: tsdr-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'tsdr'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-
-    jdk: 'openjdk7'
-
index 0ce662b0932cef4bbae6d2e4a1266db49a0ef2d7..05f717d3881549361c2e2070627294c6681054e4 100644 (file)
@@ -9,6 +9,7 @@
         - 'tsdr-verify-{stream}'
         - 'tsdr-merge-{stream}'
         - 'tsdr-daily-{stream}'
+        - 'tsdr-distribution-{stream}'
         - 'tsdr-integration-{stream}'
         - 'tsdr-sonar'
         - 'tsdr-clm'
             email-prefix: '[tsdr]'
         - jacoco-report
 
+- job-template:
+    name: 'tsdr-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'tsdr-integration-{stream}'
     disabled: false
index ea17b9a9ae1dae44ae82c810e6a540641f45697f..ce084281da83e1934fbaa51a8313f9e3750df536 100644 (file)
@@ -9,6 +9,7 @@
         - 'ttp-verify-{stream}'
         - 'ttp-merge-{stream}'
         - 'ttp-daily-{stream}'
+        - 'ttp-distribution-{stream}'
         - 'ttp-integration-{stream}'
         - 'ttp-sonar'
         - 'ttp-clm'
             email-prefix: '[ttp]'
         - jacoco-report
 
+- job-template:
+    name: 'ttp-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'ttp-integration-{stream}'
     disabled: false
diff --git a/jjb/usc/usc-distribution.yaml b/jjb/usc/usc-distribution.yaml
deleted file mode 100644 (file)
index 867c525..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: usc-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'usc'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-
-    jdk: 'openjdk7'
-
index abae771918804e9bec950fc439eeccded955bd6b..fb9b43a389418e334bd2af2dcaa87b3fb948f7ad 100644 (file)
@@ -9,6 +9,7 @@
         - 'usc-verify-{stream}'
         - 'usc-merge-{stream}'
         - 'usc-daily-{stream}'
+        - 'usc-distribution-{stream}'
         - 'usc-integration-{stream}'
         - 'usc-sonar'
         - 'usc-clm'
             email-prefix: '[usc]'
         - jacoco-report
 
+- job-template:
+    name: 'usc-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'usc-integration-{stream}'
     disabled: false
diff --git a/jjb/vpnservice/vpnservice-distribution.yaml b/jjb/vpnservice/vpnservice-distribution.yaml
deleted file mode 100644 (file)
index 217b70d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: vpnservice-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'vpnservice'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-
-    jdk: 'openjdk7'
-
index 424b758a82f766ddfa059e1adebaa7996649bb1e..2b4b6366c6d3d1efe724d28ccc21f7159299a777 100644 (file)
@@ -9,6 +9,7 @@
         - 'vpnservice-verify-{stream}'
         - 'vpnservice-merge-{stream}'
         - 'vpnservice-daily-{stream}'
+        - 'vpnservice-distribution-{stream}'
         - 'vpnservice-integration-{stream}'
         - 'vpnservice-sonar'
         - 'vpnservice-clm'
             email-prefix: '[vpnservice]'
         - jacoco-report
 
+- job-template:
+    name: 'vpnservice-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'vpnservice-integration-{stream}'
     disabled: false
diff --git a/jjb/vtn/vtn-distribution.yaml b/jjb/vtn/vtn-distribution.yaml
deleted file mode 100644 (file)
index b62c657..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: vtn-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'vtn'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 7ce129b52206e26ed5d1c8325df2615f5c3ab6fc..93668083270456d2ff2893cdb77c7f9f63001417 100644 (file)
@@ -9,6 +9,7 @@
         - 'vtn-verify-{stream}'
         - 'vtn-merge-{stream}'
         - 'vtn-daily-{stream}'
+        - 'vtn-distribution-{stream}'
         - 'vtn-integration-{stream}'
         - 'vtn-sonar'
         - 'vtn-clm'
             email-prefix: '[vtn]'
         - jacoco-report
 
+- job-template:
+    name: 'vtn-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'vtn-integration-{stream}'
     disabled: false
diff --git a/jjb/yangtools/yangtools-distribution.yaml b/jjb/yangtools/yangtools-distribution.yaml
deleted file mode 100644 (file)
index 0ae4732..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: yangtools-distribution
-    jobs:
-        - '{project}-distribution-{stream}'
-
-    # The project name
-    project: 'yangtools'
-
-    # The project branches
-    stream:
-        - master:
-            branch: 'master'
-        - stable-helium:
-            branch: 'stable/helium'
-
-    jdk: 'openjdk7'
-
index 040eb01dd8a7403122e6673c3b410365e78cc17e..9a228665574aa5d603788e0d3d39a36a8d0cb01f 100644 (file)
@@ -6,4 +6,4 @@ BRANCHES:
 - stable/lithium:
     jdks: openjdk7,openjdk8
 DEPENDENCIES: odlparent
-JOB_TEMPLATES: merge,daily,integration,sonar
+JOB_TEMPLATES: merge,daily,distribution,integration,sonar
index 1373d6d437719b5b159546aaee807163e13e16f1..28f07aee6e357860e00fbae222eeaedaebf04b1a 100644 (file)
@@ -8,6 +8,7 @@
     jobs:
         - 'yangtools-merge-{stream}'
         - 'yangtools-daily-{stream}'
+        - 'yangtools-distribution-{stream}'
         - 'yangtools-integration-{stream}'
         - 'yangtools-sonar'
         - 'yangtools-clm'
             email-prefix: '[yangtools]'
         - jacoco-report
 
+- job-template:
+    name: 'yangtools-distribution-{stream}'
+
+    project-type: maven
+    node: dynamic_merge
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: '{project}-merge-{stream}'
+            result: 'success'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+
+    maven:
+        maven-name: '{mvn32}'
+        root-pom: 'pom.xml'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: '{integration-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
+
 - job-template:
     name: 'yangtools-integration-{stream}'
     disabled: false
index 94ee546f3552c18aa8125cb3d0f07b0f7e7d7289..ef7ec41a0e69754590af61606b6d2dd28e19b8d1 100644 (file)
@@ -48,7 +48,7 @@ if os.path.isfile(project_conf):
 if cfg.get('JOB_TEMPLATES'):
     templates = cfg.get('JOB_TEMPLATES')
 else:
-    templates = "verify,merge,daily,integration,sonar"
+    templates = "verify,merge,daily,distribution,integration,sonar"
 templates += ",clm"  # ensure we always create a clm job for all projects
 
 ###################