From: Thanh Ha Date: Fri, 2 Feb 2018 18:21:39 +0000 (+0000) Subject: Merge changes from topic 'cleanup-maven' X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=95d62ba8065ca3281fb2b6265411f6412fc67594;hp=94753b322cc42e35ea12ceebf61e6acf023686c0;p=releng%2Fbuilder.git Merge changes from topic 'cleanup-maven' * changes: Remove unused {jdks} variable Remove unused {maven} variable Switch 'clean install' to 'clean deploy' Remove mvn-goals for projects that use default Set default mvn-goals for integration job --- diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index e6816390e..0d307f7ab 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -10,13 +10,7 @@ project: 'aaa' project-name: 'aaa' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'aaa-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' @@ -36,13 +30,7 @@ project: 'aaa' project-name: 'aaa' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'aaa-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' @@ -63,13 +51,7 @@ project-name: 'aaa' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'aaa-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' @@ -87,5 +69,4 @@ project-name: 'aaa' branch: 'master' mvn-settings: 'aaa-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 4527fd8e8..da8f9b443 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -10,13 +10,7 @@ project: 'alto' project-name: 'alto' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'alto-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' @@ -36,13 +30,7 @@ project: 'alto' project-name: 'alto' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'alto-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' @@ -63,13 +51,7 @@ project-name: 'alto' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'alto-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' @@ -87,5 +69,4 @@ project-name: 'alto' branch: 'master' mvn-settings: 'alto-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index 7a9dad82b..24207d711 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -10,13 +10,7 @@ project: 'atrium' project-name: 'atrium' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'atrium-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[atrium]' @@ -36,13 +30,7 @@ project: 'atrium' project-name: 'atrium' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'atrium-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[atrium]' @@ -63,13 +51,7 @@ project-name: 'atrium' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'atrium-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[atrium]' @@ -86,5 +68,4 @@ project-name: 'atrium' branch: 'master' mvn-settings: 'atrium-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index da8da068b..ce7887fb8 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -13,13 +13,7 @@ build-node: centos7-builder-2c-8g build-timeout: 120 branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'bgpcep-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' dependencies: > odlparent-merge-{stream}, @@ -47,13 +41,7 @@ build-node: centos7-builder-2c-8g build-timeout: 120 branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'bgpcep-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' dependencies: > odlparent-merge-{stream}, @@ -82,13 +70,7 @@ build-timeout: 120 branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'bgpcep-settings' - mvn-goals: 'clean -DrepoBuild install javadoc:aggregate' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' dependencies: > odlparent-merge-{stream}, @@ -112,5 +94,4 @@ build-node: centos7-builder-2c-8g branch: 'master' mvn-settings: 'bgpcep-settings' - mvn-goals: 'clean -DrepoBuild install javadoc:aggregate' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 98796735d..3a54e7137 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -11,13 +11,7 @@ project-name: 'bier' branch: 'master' build-timeout: 90 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'bier-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[bier]' @@ -37,13 +31,7 @@ project: 'bier' project-name: 'bier' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'bier-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[bier]' @@ -64,13 +52,7 @@ project-name: 'bier' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'bier-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[bier]' @@ -88,5 +70,4 @@ project-name: 'bier' branch: 'master' mvn-settings: 'bier-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index eb31447c6..bf5f301d1 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -10,13 +10,7 @@ project: 'capwap' project-name: 'capwap' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'capwap-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[capwap]' @@ -36,13 +30,7 @@ project: 'capwap' project-name: 'capwap' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'capwap-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[capwap]' @@ -63,13 +51,7 @@ project-name: 'capwap' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'capwap-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[capwap]' @@ -87,5 +69,4 @@ project-name: 'capwap' branch: master mvn-settings: 'capwap-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index ffc3baa5c..8962ee482 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -10,13 +10,7 @@ project: 'cardinal' project-name: 'cardinal' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'cardinal-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' @@ -36,13 +30,7 @@ project: 'cardinal' project-name: 'cardinal' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'cardinal-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' @@ -63,13 +51,7 @@ project-name: 'cardinal' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'cardinal-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' @@ -87,5 +69,4 @@ project-name: 'cardinal' branch: 'master' mvn-settings: 'cardinal-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index bd045cbf8..b96d01da8 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -10,13 +10,7 @@ project: 'centinel' project-name: 'centinel' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'centinel-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[centinel]' @@ -36,13 +30,7 @@ project: 'centinel' project-name: 'centinel' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'centinel-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[centinel]' @@ -63,13 +51,7 @@ project-name: 'centinel' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'centinel-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[centinel]' @@ -87,5 +69,4 @@ project-name: 'centinel' branch: master mvn-settings: 'centinel-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index bda82a856..4740ba10f 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -10,13 +10,7 @@ project-name: 'coe' stream: oxygen branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'coe-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' @@ -36,13 +30,7 @@ project-name: 'coe' stream: nitrogen branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'coe-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' @@ -62,13 +50,7 @@ stream: carbon branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'coe-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' @@ -86,5 +68,4 @@ project-name: 'coe' branch: 'master' mvn-settings: 'coe-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index f30770715..8b698b32f 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -11,13 +11,8 @@ project: 'controller' project-name: 'controller' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'controller-settings' - mvn-goals: 'clean install -Pintegrationtests,docs' + mvn-goals: 'clean deploy -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' @@ -38,13 +33,8 @@ project: 'controller' project-name: 'controller' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'controller-settings' - mvn-goals: 'clean install -Pintegrationtests,docs' + mvn-goals: 'clean deploy -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' @@ -66,13 +56,8 @@ project-name: 'controller' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'controller-settings' - mvn-goals: 'clean install -Pintegrationtests,docs' + mvn-goals: 'clean deploy -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' @@ -91,5 +76,5 @@ project-name: 'controller' branch: master mvn-settings: 'controller-settings' - mvn-goals: 'clean install -Pintegrationtests,docs' + mvn-goals: 'clean deploy -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index ae09f245f..dfd6205f1 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -9,13 +9,7 @@ project: 'coretutorials' project-name: 'coretutorials' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'coretutorials-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[coretutorials]' @@ -35,13 +29,7 @@ project: 'coretutorials' project-name: 'coretutorials' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'coretutorials-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[coretutorials]' @@ -62,13 +50,7 @@ project-name: 'coretutorials' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'coretutorials-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[coretutorials]' @@ -87,6 +69,5 @@ project-name: 'coretutorials' branch: master mvn-settings: 'coretutorials-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' build-timeout: 120 diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 96ad52781..49b7f4051 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -10,13 +10,7 @@ project-name: 'daexim' stream: oxygen branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'daexim-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[daexim] [odlparent] [yangtools] [controller]' @@ -36,13 +30,7 @@ project-name: 'daexim' stream: nitrogen branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'daexim-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[daexim] [odlparent] [yangtools] [controller]' @@ -60,5 +48,4 @@ project-name: 'daexim' branch: 'master' mvn-settings: 'daexim-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index de560eea3..c54a7e8bf 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -10,13 +10,7 @@ project: 'didm' project-name: 'didm' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'didm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[didm]' @@ -36,13 +30,7 @@ project: 'didm' project-name: 'didm' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'didm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[didm]' @@ -63,13 +51,7 @@ project-name: 'didm' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'didm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[didm]' @@ -86,5 +68,4 @@ project-name: 'didm' branch: 'master' mvn-settings: 'didm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index e6ab39ea9..fbd47780c 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -10,13 +10,7 @@ project: 'dlux' project-name: 'dlux' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'dlux-settings' - mvn-goals: 'clean install -e' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' @@ -36,13 +30,7 @@ project: 'dlux' project-name: 'dlux' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'dlux-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' @@ -63,13 +51,7 @@ project-name: 'dlux' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'dlux-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' @@ -86,5 +68,4 @@ project-name: 'dlux' branch: 'master' mvn-settings: 'dlux-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 0b479d155..2eea9a58a 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -10,13 +10,7 @@ project-name: 'dluxapps' stream: oxygen branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'dluxapps-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' @@ -36,13 +30,7 @@ project-name: 'dluxapps' stream: nitrogen branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'dluxapps-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' @@ -63,13 +51,7 @@ stream: carbon branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'dluxapps-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' @@ -87,5 +69,4 @@ project-name: 'dluxapps' branch: 'master' mvn-settings: 'dluxapps-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index df4f24a34..e2c75d2e1 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -11,13 +11,7 @@ project: 'eman' project-name: 'eman' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'eman-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[eman]' @@ -39,13 +33,7 @@ project: 'eman' project-name: 'eman' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'eman-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[eman]' @@ -68,13 +56,7 @@ project-name: 'eman' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'eman-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[eman]' @@ -92,5 +74,4 @@ project-name: 'eman' branch: 'master' mvn-settings: 'eman-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index af7804f42..cd16b5827 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -10,13 +10,7 @@ project: 'faas' project-name: 'faas' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'faas-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[faas]' @@ -36,13 +30,7 @@ project: 'faas' project-name: 'faas' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'faas-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[faas]' @@ -63,13 +51,7 @@ project-name: 'faas' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'faas-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[faas]' @@ -86,5 +68,4 @@ project-name: 'faas' branch: 'master' mvn-settings: 'faas-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index b4180e1b3..d680b128f 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -11,13 +11,7 @@ project-name: 'federation' stream: oxygen branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'federation-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[federation] [odlparent] [yangtools] [controller]' @@ -38,13 +32,7 @@ project-name: 'federation' stream: nitrogen branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'federation-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[federation] [odlparent] [yangtools] [controller]' @@ -66,13 +54,7 @@ stream: carbon branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'federation-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[federation] [odlparent] [yangtools] [controller]' @@ -90,5 +72,4 @@ project-name: 'federation' branch: 'master' mvn-settings: 'federation-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index a11bd16a7..32690ccf8 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -11,13 +11,7 @@ project: 'genius' project-name: 'genius' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'genius-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' build-timeout: 90 dependencies: > @@ -43,13 +37,7 @@ project: 'genius' project-name: 'genius' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'genius-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: > controller-merge-{stream}, @@ -75,13 +63,7 @@ project-name: 'genius' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'genius-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: > controller-merge-{stream}, @@ -103,5 +85,4 @@ project-name: 'genius' branch: 'master' mvn-settings: 'genius-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/global-jjb b/jjb/global-jjb index d38f363f0..d22c3fe8f 160000 --- a/jjb/global-jjb +++ b/jjb/global-jjb @@ -1 +1 @@ -Subproject commit d38f363f0ebb7246b9481900a5f1fa2ef0bab3e8 +Subproject commit d22c3fe8f7bc3f3276dedd7448c4f82f50fe7584 diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index dcf6c8ccc..b60c2efdf 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -10,13 +10,8 @@ project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'groupbasedpolicy-settings' - mvn-goals: '-U clean install findbugs:findbugs' + mvn-goals: '-U clean deploy findbugs:findbugs' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' build-timeout: 90 dependencies: > @@ -42,13 +37,8 @@ project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'groupbasedpolicy-settings' - mvn-goals: '-U clean install findbugs:findbugs' + mvn-goals: '-U clean deploy findbugs:findbugs' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: > openflowjava-merge-{stream}, @@ -74,13 +64,8 @@ project-name: 'groupbasedpolicy' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'groupbasedpolicy-settings' - mvn-goals: '-U clean install findbugs:findbugs' + mvn-goals: '-U clean deploy findbugs:findbugs' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: > openflowjava-merge-{stream}, @@ -102,5 +87,5 @@ project-name: 'groupbasedpolicy' branch: 'master' mvn-settings: 'groupbasedpolicy-settings' - mvn-goals: '-U clean install findbugs:findbugs' + mvn-goals: '-U clean deploy findbugs:findbugs' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index 157660f36..4d3c545a3 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -10,13 +10,7 @@ project: 'honeycomb/vbd' project-name: 'vbd' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'honeycomb-vbd-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[vbd]' @@ -36,13 +30,7 @@ project: 'honeycomb/vbd' project-name: 'vbd' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'honeycomb-vbd-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[vbd]' @@ -63,13 +51,7 @@ project-name: 'vbd' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'honeycomb-vbd-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[vbd]' @@ -86,5 +68,4 @@ project-name: 'vbd' branch: 'master' mvn-settings: 'honeycomb-vbd-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 77fe7e4b3..77dfce739 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -11,13 +11,7 @@ project: 'infrautils' project-name: 'infrautils' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'infrautils-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' @@ -37,13 +31,7 @@ project: 'infrautils' project-name: 'infrautils' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'infrautils-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' @@ -64,13 +52,7 @@ project-name: 'infrautils' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'infrautils-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' @@ -87,5 +69,4 @@ project-name: 'infrautils' branch: 'master' mvn-settings: 'infrautils-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index c2c135ab6..bcb999f00 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -10,13 +10,7 @@ project: 'iotdm' project-name: 'iotdm' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'iotdm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'aaa-merge-{stream}' email-upstream: '[iotdm] [aaa]' @@ -36,13 +30,7 @@ project: 'iotdm' project-name: 'iotdm' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'iotdm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'aaa-merge-{stream}' email-upstream: '[iotdm] [aaa]' @@ -63,13 +51,7 @@ project-name: 'iotdm' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'iotdm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'aaa-merge-{stream}' email-upstream: '[iotdm] [aaa]' @@ -86,5 +68,4 @@ project-name: 'iotdm' branch: 'master' mvn-settings: 'iotdm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 48cb51f35..aa9d59210 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -9,13 +9,7 @@ project-name: 'jsonrpc' stream: fluorine branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'jsonrpc-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' @@ -34,13 +28,7 @@ project-name: 'jsonrpc' stream: oxygen branch: 'stable/oxygen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'jsonrpc-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' @@ -59,13 +47,7 @@ project-name: 'jsonrpc' stream: nitrogen branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'jsonrpc-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' @@ -85,13 +67,7 @@ stream: carbon branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'jsonrpc-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' @@ -109,5 +85,4 @@ project-name: 'jsonrpc' branch: 'master' mvn-settings: 'jsonrpc-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index f203d8959..3cb1e9378 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -10,13 +10,7 @@ project: 'l2switch' project-name: 'l2switch' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'l2switch-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: > odlparent-merge-{stream}, @@ -41,13 +35,7 @@ project: 'l2switch' project-name: 'l2switch' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'l2switch-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: > odlparent-merge-{stream}, @@ -73,13 +61,7 @@ project-name: 'l2switch' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'l2switch-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: > odlparent-merge-{stream}, @@ -101,5 +83,4 @@ project-name: 'l2switch' branch: 'master' mvn-settings: 'l2switch-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 72c8ca70b..194a76145 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -10,13 +10,7 @@ project: 'lacp' project-name: 'lacp' branch: 'master' - jdks: - - openjdk8 mvn-settings: 'lacp-settings' - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' email-upstream: '[lacp] [openflowjava] [openflowplugin]' @@ -36,13 +30,7 @@ project: 'lacp' project-name: 'lacp' branch: 'stable/nitrogen' - jdks: - - openjdk8 mvn-settings: 'lacp-settings' - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' email-upstream: '[lacp] [openflowjava] [openflowplugin]' @@ -63,13 +51,7 @@ project-name: 'lacp' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 mvn-settings: 'lacp-settings' - maven: - - mvn33: - mvn-version: 'mvn33' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' email-upstream: '[lacp] [openflowjava] [openflowplugin]' @@ -86,5 +68,4 @@ project-name: 'lacp' branch: 'master' mvn-settings: 'lacp-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 582621eec..2f0e2d50e 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -11,13 +11,8 @@ project: 'lispflowmapping' project-name: 'lispflowmapping' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'lispflowmapping-settings' - mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild' + mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' @@ -42,13 +37,8 @@ project: 'lispflowmapping' project-name: 'lispflowmapping' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'lispflowmapping-settings' - mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild' + mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' @@ -74,13 +64,8 @@ project-name: 'lispflowmapping' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'lispflowmapping-settings' - mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild' + mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' @@ -98,5 +83,5 @@ project-name: 'lispflowmapping' branch: 'master' mvn-settings: 'lispflowmapping-settings' - mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild' + mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 79e498ce1..a52d25ce2 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -11,13 +11,8 @@ project: 'mdsal' project-name: 'mdsal' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'mdsal-settings' - mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests' + mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' @@ -39,13 +34,8 @@ project: 'mdsal' project-name: 'mdsal' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'mdsal-settings' - mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests' + mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[mdsal] [odlparent] [yangtools]' @@ -67,13 +57,8 @@ project-name: 'mdsal' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'mdsal-settings' - mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests' + mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[mdsal] [odlparent] [yangtools]' @@ -90,5 +75,5 @@ project-name: 'mdsal' branch: 'master' mvn-settings: 'mdsal-settings' - mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests' + mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 5c6f81e30..4c928c39b 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -11,13 +11,7 @@ project: 'messaging4transport' project-name: 'messaging4transport' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'messaging4transport-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[messaging4transport]' @@ -38,13 +32,7 @@ project: 'messaging4transport' project-name: 'messaging4transport' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'messaging4transport-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[messaging4transport]' @@ -66,13 +54,7 @@ project-name: 'messaging4transport' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'messaging4transport-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[messaging4transport]' @@ -89,5 +71,4 @@ project-name: 'messaging4transport' branch: 'master' mvn-settings: 'messaging4transport-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 023296967..b40529213 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -11,13 +11,7 @@ project: 'natapp' project-name: 'natapp' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'natapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[natapp] [openflowplugin]' @@ -38,13 +32,7 @@ project: 'natapp' project-name: 'natapp' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'natapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[natapp] [openflowplugin]' @@ -66,13 +54,7 @@ project-name: 'natapp' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'natapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[natapp] [openflowplugin]' @@ -89,5 +71,4 @@ project-name: 'natapp' branch: 'master' mvn-settings: 'natapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 0b37f358e..3a9c047e2 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -10,13 +10,7 @@ project: 'nemo' project-name: 'nemo' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'nemo-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[nemo]' @@ -36,13 +30,7 @@ project: 'nemo' project-name: 'nemo' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'nemo-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[nemo]' @@ -63,13 +51,7 @@ project-name: 'nemo' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'nemo-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[nemo]' @@ -86,5 +68,4 @@ project-name: 'nemo' branch: 'master' mvn-settings: 'nemo-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 806cd5ee7..026cebb91 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -10,13 +10,8 @@ project: 'netconf' project-name: 'netconf' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'netconf-settings' - mvn-goals: 'clean install -Pintegrationtests' + mvn-goals: 'clean deploy -Pintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' build-timeout: 90 dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' @@ -37,13 +32,8 @@ project: 'netconf' project-name: 'netconf' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'netconf-settings' - mvn-goals: 'clean install -Pintegrationtests' + mvn-goals: 'clean deploy -Pintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' @@ -64,13 +54,8 @@ project-name: 'netconf' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'netconf-settings' - mvn-goals: 'clean install -Pintegrationtests' + mvn-goals: 'clean deploy -Pintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' @@ -87,5 +72,5 @@ project-name: 'netconf' branch: 'master' mvn-settings: 'netconf-settings' - mvn-goals: 'clean install -Pintegrationtests' + mvn-goals: 'clean deploy -Pintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 318b15c50..9952388a7 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -10,13 +10,7 @@ project: 'netide' project-name: 'netide' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'netide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream}' email-upstream: '[netide] [openflowjava]' @@ -36,13 +30,7 @@ project: 'netide' project-name: 'netide' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'netide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream}' email-upstream: '[netide] [openflowjava]' @@ -63,13 +51,7 @@ project-name: 'netide' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'netide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream}' email-upstream: '[netide] [openflowjava]' @@ -86,5 +68,4 @@ project-name: 'netide' branch: 'master' mvn-settings: 'netide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 846501688..943f00a10 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -18,13 +18,7 @@ karaf-version: karaf3 project: 'netvirt' project-name: 'netvirt' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'netvirt-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' build-timeout: 90 build-node: centos7-builder-4c-16g @@ -52,13 +46,7 @@ branch: 'topic/vpp' karaf-version: karaf3 distribution_branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'netvirt-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' dependencies: email-upstream: '[netvirt]' @@ -72,5 +60,4 @@ project-name: 'netvirt' branch: 'master' mvn-settings: 'netvirt-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 3f3de316a..b56980226 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -12,13 +12,7 @@ project-name: 'neutron' build-timeout: 90 branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'neutron-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' @@ -40,13 +34,7 @@ project-name: 'neutron' build-timeout: 60 branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'neutron-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' @@ -69,13 +57,7 @@ build-timeout: 60 branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'neutron-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' @@ -92,5 +74,4 @@ project-name: 'neutron' branch: 'master' mvn-settings: 'neutron-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 36c1d21e9..338f2b037 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -10,13 +10,7 @@ project: 'next' project-name: 'next' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'next-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[next]' @@ -36,13 +30,7 @@ project: 'next' project-name: 'next' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'next-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[next]' @@ -63,13 +51,7 @@ project-name: 'next' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'next-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[next]' @@ -85,6 +67,5 @@ project: 'next' project-name: 'next' branch: 'master' - mvn-settings: 'tsdr-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' + mvn-settings: 'next-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 0af5510cd..5ee9a4850 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -10,13 +10,7 @@ project: 'nic' project-name: 'nic' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'nic-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' email-upstream: '[nic] [vtn] [groupbasedpolicy]' @@ -36,13 +30,7 @@ project: 'nic' project-name: 'nic' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'nic-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' email-upstream: '[nic] [vtn] [groupbasedpolicy]' @@ -63,13 +51,7 @@ project-name: 'nic' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'nic-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' email-upstream: '[nic] [vtn] [groupbasedpolicy]' @@ -86,5 +68,4 @@ project-name: 'nic' branch: 'master' mvn-settings: 'nic-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 9865f61af..239fdc64c 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -10,13 +10,7 @@ project: 'ocpplugin' project-name: 'ocpplugin' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'ocpplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' @@ -36,13 +30,7 @@ project: 'ocpplugin' project-name: 'ocpplugin' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'ocpplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' @@ -63,13 +51,7 @@ project-name: 'ocpplugin' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'ocpplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' @@ -86,5 +68,4 @@ project-name: 'ocpplugin' branch: 'master' mvn-settings: 'ocpplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 3a13df042..46a237a5c 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -12,13 +12,7 @@ branch: master distribution_branch: master - jdks: - - openjdk8 - maven: - - mvn35: - mvn-version: mvn35 mvn-settings: odlparent-settings - mvn-goals: clean install mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' mvn-version: mvn35 @@ -48,15 +42,8 @@ branch: 3.1.x distribution_branch: master - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: mvn33 mvn-settings: odlparent-settings - mvn-goals: clean install mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: mvn33 dependencies: '' email-upstream: '[odlparent]' @@ -85,15 +72,8 @@ branch: 3.0.x distribution_branch: master - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: mvn33 mvn-settings: odlparent-settings - mvn-goals: clean install mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: mvn33 dependencies: '' email-upstream: '[odlparent]' @@ -122,15 +102,8 @@ branch: 2.0.x distribution_branch: master - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: mvn33 mvn-settings: odlparent-settings - mvn-goals: clean install mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: mvn33 dependencies: '' email-upstream: '[odlparent]' @@ -160,13 +133,7 @@ project-name: 'odlparent' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'odlparent-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[odlparent]' @@ -191,5 +158,4 @@ project-name: 'odlparent' branch: 'master' mvn-settings: 'odlparent-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 7677ec676..b119ff3b2 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -10,13 +10,7 @@ project: 'of-config' project-name: 'of-config' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'of-config-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' @@ -36,13 +30,7 @@ project: 'of-config' project-name: 'of-config' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'of-config-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' @@ -63,13 +51,7 @@ project-name: 'of-config' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'of-config-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' @@ -86,5 +68,4 @@ project-name: 'of-config' branch: 'master' mvn-settings: 'of-config-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 66bfcae95..ab4d336fe 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -9,13 +9,7 @@ project: 'ofextensions/circuitsw' project-name: 'circuitsw' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'ofextensions-circuitsw-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[circuitsw]' @@ -34,13 +28,7 @@ project: 'ofextensions/circuitsw' project-name: 'circuitsw' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'ofextensions-circuitsw-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[circuitsw]' @@ -59,13 +47,7 @@ project: 'ofextensions/circuitsw' project-name: 'circuitsw' branch: 'stable/carbon' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'ofextensions-circuitsw-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[circuitsw]' @@ -82,5 +64,4 @@ project-name: 'circuitsw' branch: 'master' mvn-settings: 'ofextensions-circuitsw-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index c2a080e1d..66561f090 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -11,13 +11,7 @@ project: 'openflowjava' project-name: 'openflowjava' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'openflowjava-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' @@ -39,13 +33,7 @@ project-name: 'openflowjava' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'openflowjava-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' @@ -62,5 +50,4 @@ project-name: 'openflowjava' branch: 'master' mvn-settings: 'openflowjava-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index fcb6ef944..f32368689 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -11,13 +11,8 @@ project: 'openflowplugin' project-name: 'openflowplugin' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'openflowplugin-settings' - mvn-goals: 'clean install javadoc:aggregate' + mvn-goals: 'clean deploy javadoc:aggregate' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' build-timeout: 90 dependencies: > @@ -43,13 +38,8 @@ project: 'openflowplugin' project-name: 'openflowplugin' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'openflowplugin-settings' - mvn-goals: 'clean install javadoc:aggregate' + mvn-goals: 'clean deploy javadoc:aggregate' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: > odlparent-merge-{stream}, @@ -75,13 +65,8 @@ project-name: 'openflowplugin' branch: 'stable/carbon' karaf-version: 'karaf3' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'openflowplugin-settings' - mvn-goals: 'clean install javadoc:aggregate' + mvn-goals: 'clean deploy javadoc:aggregate' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: > odlparent-merge-{stream}, @@ -102,5 +87,5 @@ project-name: 'openflowplugin' branch: 'master' mvn-settings: 'openflowplugin-settings' - mvn-goals: 'clean install javadoc:aggregate' + mvn-goals: 'clean deploy javadoc:aggregate' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml index 2e5d81414..870839d26 100644 --- a/jjb/ovil/ovil.yaml +++ b/jjb/ovil/ovil.yaml @@ -11,9 +11,7 @@ - oxygen: branch: master mvn-settings: ovil-settings - mvn-goals: clean install mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: mvn33 dependencies: '' email-upstream: '[ovil]' @@ -30,5 +28,4 @@ project-name: 'ovil' branch: 'master' mvn-settings: 'ovil-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index a87a43b98..c9118a47d 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -11,13 +11,7 @@ project: 'ovsdb' project-name: 'ovsdb' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'ovsdb-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' @@ -38,13 +32,7 @@ project: 'ovsdb' project-name: 'ovsdb' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'ovsdb-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' @@ -66,13 +54,7 @@ project-name: 'ovsdb' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'ovsdb-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 985d6b25e..1fd08e53b 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -11,13 +11,7 @@ project: 'p4plugin' project-name: 'p4plugin' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'p4plugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[p4plugin]' @@ -35,5 +29,4 @@ project-name: 'p4plugin' branch: 'master' mvn-settings: 'p4plugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index afdf9373d..893de90b9 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -10,13 +10,7 @@ project: 'packetcable' project-name: 'packetcable' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'packetcable-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[packetcable]' @@ -36,13 +30,7 @@ project: 'packetcable' project-name: 'packetcable' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'packetcable-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[packetcable]' @@ -63,13 +51,7 @@ project-name: 'packetcable' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'packetcable-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[packetcable]' @@ -86,5 +68,4 @@ project-name: 'packetcable' branch: 'master' mvn-settings: 'packetcable-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index d89c48f5b..1b7254c9c 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -10,14 +10,7 @@ project-name: 'persistence' branch: 'master' jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'persistence-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[persistence]' @@ -37,14 +30,7 @@ project-name: 'persistence' branch: 'stable/nitrogen' jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'persistence-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[persistence]' @@ -65,14 +51,7 @@ branch: 'stable/carbon' karaf-version: karaf3 jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'persistence-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[persistence]' @@ -89,5 +68,4 @@ project-name: 'persistence' branch: 'master' mvn-settings: 'persistence-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index e8a9d82bd..259ef1960 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -20,6 +20,16 @@ - job-template: name: '{project-name}-integration-{stream}' + ###################### + # Default parameters # + ###################### + + mvn-goals: clean install + + ##################### + # Job Configuration # + ##################### + project-type: freestyle node: '{build-node}' jdk: '{jdk}' diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 1e32c5d21..47ae0223c 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -9,13 +9,7 @@ project: 'reservation' project-name: 'reservation' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'reservation-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[reservation]' @@ -34,13 +28,7 @@ project: 'reservation' project-name: 'reservation' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'reservation-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[reservation]' @@ -60,13 +48,7 @@ project-name: 'reservation' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'reservation-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[reservation]' @@ -83,5 +65,4 @@ project-name: 'reservation' branch: 'master' mvn-settings: 'reservation-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 90d2d5aa5..a970d3baf 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -10,13 +10,7 @@ project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'sdninterfaceapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'bgpcep-merge-{stream}' email-upstream: '[sdninterfaceapp] [bgpcep]' @@ -36,13 +30,7 @@ project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'sdninterfaceapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'bgpcep-merge-{stream}' email-upstream: '[sdninterfaceapp] [bgpcep]' @@ -63,13 +51,7 @@ project-name: 'sdninterfaceapp' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'sdninterfaceapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'bgpcep-merge-{stream}' email-upstream: '[sdninterfaceapp] [bgpcep]' @@ -86,5 +68,4 @@ project-name: 'sdninterfaceapp' branch: 'master' mvn-settings: 'sdninterfaceapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 972f346a2..350e6c49c 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -10,13 +10,7 @@ project: 'sfc' project-name: 'sfc' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'sfc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' build-timeout: 120 dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' @@ -38,13 +32,7 @@ project: 'sfc' project-name: 'sfc' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'sfc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' @@ -66,13 +54,7 @@ project-name: 'sfc' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'sfc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' @@ -90,5 +72,4 @@ project-name: 'sfc' branch: 'master' mvn-settings: 'sfc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 6958d317b..b580353fa 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -10,13 +10,7 @@ project: 'snbi' project-name: 'snbi' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'snbi-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[snbi]' @@ -36,13 +30,7 @@ project: 'snbi' project-name: 'snbi' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'snbi-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[snbi]' @@ -63,13 +51,7 @@ project-name: 'snbi' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'snbi-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[snbi]' @@ -86,5 +68,4 @@ project-name: 'snbi' branch: 'master' mvn-settings: 'snbi-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index c73acb1be..0797d5820 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -10,13 +10,7 @@ project: 'snmp' project-name: 'snmp' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'snmp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' @@ -36,13 +30,7 @@ project: 'snmp' project-name: 'snmp' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'snmp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' @@ -63,13 +51,7 @@ project-name: 'snmp' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'snmp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' @@ -86,5 +68,4 @@ project-name: 'snmp' branch: 'master' mvn-settings: 'snmp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index b29129035..6bf8e0fec 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -10,13 +10,7 @@ project: 'snmp4sdn' project-name: 'snmp4sdn' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'snmp4sdn-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' @@ -36,13 +30,7 @@ project: 'snmp4sdn' project-name: 'snmp4sdn' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'snmp4sdn-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' @@ -63,13 +51,7 @@ project-name: 'snmp4sdn' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'snmp4sdn-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' @@ -86,5 +68,4 @@ project-name: 'snmp4sdn' branch: 'master' mvn-settings: 'snmp4sdn-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index a74ba2d59..bbc06bd2e 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -10,13 +10,7 @@ project: 'sxp' project-name: 'sxp' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'sxp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' @@ -36,13 +30,7 @@ project: 'sxp' project-name: 'sxp' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'sxp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' @@ -63,13 +51,7 @@ project-name: 'sxp' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'sxp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' @@ -86,5 +68,4 @@ project-name: 'sxp' branch: 'master' mvn-settings: 'sxp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index 88514e606..e90c54398 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -9,13 +9,7 @@ project-name: 'systemmetrics' stream: oxygen branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'systemmetrics-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' @@ -34,13 +28,7 @@ project-name: 'systemmetrics' stream: nitrogen branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'systemmetrics-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' @@ -60,13 +48,7 @@ stream: carbon branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'systemmetrics-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' @@ -84,5 +66,4 @@ project-name: 'systemmetrics' branch: 'master' mvn-settings: 'systemmetrics-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 6c78c55e2..95a78bf24 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -10,13 +10,7 @@ project: 'topoprocessing' project-name: 'topoprocessing' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'topoprocessing-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' @@ -36,13 +30,7 @@ project: 'topoprocessing' project-name: 'topoprocessing' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'topoprocessing-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' @@ -63,13 +51,7 @@ project-name: 'topoprocessing' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'topoprocessing-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' @@ -85,9 +67,5 @@ project: 'topoprocessing' project-name: 'topoprocessing' branch: 'master' - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'topoprocessing-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index a905cf964..c1602ba26 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -9,13 +9,7 @@ project-name: 'transportpce' stream: oxygen branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'transportpce-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' @@ -34,13 +28,7 @@ project-name: 'transportpce' stream: nitrogen branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'transportpce-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' @@ -60,13 +48,7 @@ stream: carbon branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'transportpce-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' @@ -84,5 +66,4 @@ project-name: 'transportpce' branch: 'master' mvn-settings: 'transportpce-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index d1cae2d6a..8b26f5df0 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -10,13 +10,7 @@ project: 'tsdr' project-name: 'tsdr' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'tsdr-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[tsdr]' @@ -36,13 +30,7 @@ project: 'tsdr' project-name: 'tsdr' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'tsdr-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[tsdr]' @@ -63,13 +51,7 @@ project-name: 'tsdr' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'tsdr-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[tsdr]' @@ -86,5 +68,4 @@ project-name: 'tsdr' branch: 'master' mvn-settings: 'tsdr-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 41de1a0dd..61b061724 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -10,13 +10,7 @@ project: 'ttp' project-name: 'ttp' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'ttp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[ttp] [odlparent]' @@ -36,13 +30,7 @@ project: 'ttp' project-name: 'ttp' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'ttp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[ttp] [odlparent]' @@ -63,13 +51,7 @@ project-name: 'ttp' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'ttp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[ttp] [odlparent]' @@ -86,5 +68,4 @@ project-name: 'ttp' branch: 'master' mvn-settings: 'ttp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 10f602889..10e12ff2e 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -10,13 +10,7 @@ project: 'unimgr' project-name: 'unimgr' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'unimgr-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' @@ -37,13 +31,7 @@ project: 'unimgr' project-name: 'unimgr' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'unimgr-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' @@ -65,13 +53,7 @@ project-name: 'unimgr' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'unimgr-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' @@ -89,5 +71,4 @@ project-name: 'unimgr' branch: 'master' mvn-settings: 'unimgr-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 86b4017fe..16a9e10e2 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -11,13 +11,7 @@ project: 'usc' project-name: 'usc' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'usc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' @@ -38,13 +32,7 @@ project: 'usc' project-name: 'usc' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'usc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' @@ -66,13 +54,7 @@ project-name: 'usc' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'usc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' @@ -89,5 +71,4 @@ project-name: 'usc' branch: 'master' mvn-settings: 'usc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index 1efca00c4..4d0ee2843 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -10,13 +10,7 @@ project: 'usecplugin' project-name: 'usecplugin' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'usecplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[usecplugin] [openflowplugin]' @@ -36,13 +30,7 @@ project: 'usecplugin' project-name: 'usecplugin' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'usecplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[usecplugin] [openflowplugin]' @@ -63,13 +51,7 @@ project-name: 'usecplugin' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'usecplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[usecplugin] [openflowplugin]' @@ -86,5 +68,4 @@ project: 'usecplugin' project-name: 'usecplugin' mvn-settings: 'usecplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index 844a26552..e0c973e45 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -11,13 +11,8 @@ project: 'vtn' project-name: 'vtn' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'vtn-settings' - mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' + mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}' email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]' @@ -42,13 +37,8 @@ project: 'vtn' project-name: 'vtn' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'vtn-settings' - mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' + mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}' email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]' @@ -74,13 +64,8 @@ project-name: 'vtn' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'vtn-settings' - mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' + mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}' email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]' @@ -101,5 +86,5 @@ project-name: 'vtn' branch: 'master' mvn-settings: 'vtn-settings' - mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' + mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index fc38e865b..bc312bc65 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -10,13 +10,7 @@ project: 'yang-push' project-name: 'yang-push' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'yang-push-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[yang-push]' @@ -36,13 +30,7 @@ project: 'yang-push' project-name: 'yang-push' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'yang-push-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[yang-push]' @@ -63,13 +51,7 @@ project-name: 'yang-push' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'yang-push-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[yang-push]' @@ -86,5 +68,4 @@ project-name: 'yang-push' branch: 'master' mvn-settings: 'yang-push-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index cd0617c9c..98e63de30 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -9,13 +9,7 @@ project: 'yangide' project-name: 'yangide' branch: 'master' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'yangide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[yangide] [odlparent] [yangtools]' @@ -34,13 +28,7 @@ project: 'yangide' project-name: 'yangide' branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'yangide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[yangide] [odlparent] [yangtools]' @@ -60,13 +48,7 @@ project-name: 'yangide' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'yangide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[yangide] [odlparent] [yangtools]' @@ -84,5 +66,4 @@ project-name: 'yangide' branch: 'master' mvn-settings: 'yangide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 2a67a52d7..5dbfb07b9 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -10,15 +10,8 @@ branch: master stream: master - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'yangtools-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: mvn33 dependencies: '' email-upstream: '[yangtools]' @@ -46,15 +39,8 @@ project-name: 'yangtools' branch: 'v1.2.x' distribution_branch: 'stable/nitrogen' - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'yangtools-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: mvn33 dependencies: 'odlparent-merge-{stream}' email-upstream: '[yangtools] [odlparent]' @@ -82,15 +68,8 @@ project-name: 'yangtools' branch: 'stable/carbon' karaf-version: karaf3 - jdks: - - openjdk8 - maven: - - mvn33: - mvn-version: 'mvn33' mvn-settings: 'yangtools-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: mvn33 dependencies: 'odlparent-merge-{stream}' email-upstream: '[yangtools] [odlparent]' @@ -114,5 +93,4 @@ project-name: 'yangtools' branch: 'master' mvn-settings: 'yangtools-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'