From e8a56411730412990a7ad3ef97bcee5643d981a9 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 11 Apr 2017 09:58:22 +1000 Subject: [PATCH] Nitrogen branch cutting Change-Id: I1cb71b4eda04fcfd1751b65464f695497ad540e5 Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 5 ++- jjb/aaa/aaa-csit-idmlite.yaml | 5 ++- jjb/aaa/aaa-csit-keystone.yaml | 5 ++- jjb/aaa/aaa-csit-tls.yaml | 5 ++- jjb/aaa/aaa-patch-test.yaml | 5 ++- jjb/aaa/aaa.yaml | 29 ++++++++++++++- jjb/alto/alto-csit-setup.yaml | 5 ++- jjb/alto/alto.yaml | 29 ++++++++++++++- jjb/armoury/armoury-csit-basic.yaml | 5 ++- jjb/armoury/armoury.yaml | 28 ++++++++++++++- jjb/atrium/atrium.yaml | 29 ++++++++++++++- jjb/autorelease/autorelease-projects.yaml | 7 +++- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 5 ++- jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 5 ++- jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 5 ++- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 5 ++- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 5 ++- jjb/bgpcep/bgpcep.yaml | 35 ++++++++++++++++++- jjb/bier/bier-csit-basic.yaml | 5 ++- jjb/capwap/capwap-csit-ac.yaml | 5 ++- jjb/capwap/capwap.yaml | 29 ++++++++++++++- jjb/cardinal/cardinal.yaml | 29 ++++++++++++++- jjb/centinel/centinel-csit-basic.yaml | 5 ++- jjb/centinel/centinel.yaml | 29 ++++++++++++++- jjb/coe/coe.yaml | 27 +++++++++++++- jjb/controller/controller-csit-akka1.yaml | 5 ++- .../controller-csit-clustering.yaml | 5 ++- .../controller-csit-dnb-noloss.yaml | 5 ++- .../controller-csit-drb-partnheal.yaml | 5 ++- .../controller-csit-drb-precedence.yaml | 5 ++- ...ler-csit-periodic-dsbenchmark-cluster.yaml | 5 ++- .../controller-csit-periodic-dsbenchmark.yaml | 5 ++- .../controller-csit-rest-cars-perf.yaml | 5 ++- .../controller-csit-rest-clust-cars-perf.yaml | 5 ++- jjb/controller/controller.yaml | 29 ++++++++++++++- jjb/coretutorials/coretutorials.yaml | 27 +++++++++++++- jjb/daexim/daexim-csit-basic.yaml | 5 ++- jjb/daexim/daexim.yaml | 27 +++++++++++++- jjb/didm/didm-csit-discovery.yaml | 5 ++- jjb/didm/didm.yaml | 29 ++++++++++++++- jjb/discovery/discovery.yaml | 27 +++++++++++++- jjb/dlux/dlux.yaml | 29 ++++++++++++++- jjb/dluxapps/dluxapps.yaml | 29 ++++++++++++++- jjb/docs/docs-rtd.yaml | 5 ++- jjb/eman/eman-csit-model.yaml | 5 ++- jjb/eman/eman.yaml | 29 ++++++++++++++- jjb/faas/faas.yaml | 29 ++++++++++++++- jjb/federation/federation.yaml | 29 ++++++++++++++- jjb/genius/genius-csit-genius.yaml | 5 ++- jjb/genius/genius-patch-test.yaml | 5 ++- jjb/genius/genius.yaml | 34 +++++++++++++++++- ...groupbasedpolicy-csit-1node-openstack.yaml | 6 +++- .../groupbasedpolicy-csit-3node.yaml | 5 ++- .../groupbasedpolicy-csit-6node.yaml | 5 ++- .../groupbasedpolicy-csit-clustering.yaml | 5 ++- .../groupbasedpolicy-csit-sxp.yaml | 5 ++- jjb/groupbasedpolicy/groupbasedpolicy.yaml | 34 +++++++++++++++++- jjb/honeycomb/vbd/vbd.yaml | 29 ++++++++++++++- jjb/infrautils/infrautils.yaml | 29 ++++++++++++++- jjb/integration/distribution-jobs.yaml | 5 ++- .../distribution-csit-userfeatures.yaml | 5 ++- .../distribution/distribution.yaml | 5 ++- jjb/integration/integration-test-jobs.yaml | 9 ++++- jjb/iotdm/iotdm-csit-basic.yaml | 5 ++- jjb/iotdm/iotdm.yaml | 29 ++++++++++++++- jjb/jsonrpc/jsonrpc.yaml | 26 +++++++++++++- .../l2switch-csit-host-scalability-daily.yaml | 5 ++- jjb/l2switch/l2switch-csit-scalability.yaml | 5 ++- jjb/l2switch/l2switch-csit-switch.yaml | 5 ++- jjb/l2switch/l2switch-patch-test.yaml | 5 ++- jjb/l2switch/l2switch.yaml | 34 +++++++++++++++++- jjb/lacp/lacp-csit-lacp.yaml | 5 ++- jjb/lacp/lacp.yaml | 29 ++++++++++++++- .../lispflowmapping-csit-msmr.yaml | 5 ++- .../lispflowmapping-csit-performance.yaml | 5 ++- jjb/lispflowmapping/lispflowmapping.yaml | 30 +++++++++++++++- jjb/mdsal/mdsal-csit-bindingv1.yaml | 5 ++- jjb/mdsal/mdsal.yaml | 29 ++++++++++++++- .../messaging4transport-csit-basic.yaml | 5 ++- .../messaging4transport.yaml | 29 ++++++++++++++- jjb/natapp/natapp-csit-basic.yaml | 5 ++- jjb/natapp/natapp.yaml | 29 ++++++++++++++- jjb/nemo/nemo-csit-engine.yaml | 5 ++- jjb/nemo/nemo.yaml | 29 ++++++++++++++- jjb/netconf/netconf-cluster-stress.yaml | 5 ++- jjb/netconf/netconf-clustering-scale.yaml | 5 ++- jjb/netconf/netconf-clustering.yaml | 5 ++- jjb/netconf/netconf-scale.yaml | 5 ++- jjb/netconf/netconf-userfeatures.yaml | 5 ++- jjb/netconf/netconf.yaml | 29 ++++++++++++++- jjb/netide/netide-csit-basic.yaml | 5 ++- jjb/netide/netide.yaml | 29 ++++++++++++++- .../netvirt-csit-hwvtep-openstack.yaml | 5 ++- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 5 ++- jjb/netvirt/netvirt-full-integration.yaml | 5 ++- jjb/netvirt/netvirt-patch-test.yaml | 5 ++- jjb/netvirt/netvirt.yaml | 35 ++++++++++++++++++- jjb/neutron/neutron.yaml | 30 +++++++++++++++- jjb/next/next.yaml | 29 ++++++++++++++- jjb/nic/nic-csit-basic.yaml | 5 ++- jjb/nic/nic-csit-vtnrenderer.yaml | 5 ++- jjb/nic/nic.yaml | 29 ++++++++++++++- jjb/ocpplugin/ocpplugin-csit-basic.yaml | 5 ++- jjb/ocpplugin/ocpplugin-csit-scalability.yaml | 5 ++- jjb/ocpplugin/ocpplugin.yaml | 29 ++++++++++++++- jjb/odlparent/odlparent.yaml | 30 +++++++++++++++- jjb/of-config/of-config-csit-basic.yaml | 5 ++- jjb/of-config/of-config.yaml | 29 ++++++++++++++- jjb/ofextensions/circuitsw/circuitsw.yaml | 27 +++++++++++++- jjb/openflowjava/openflowjava.yaml | 29 ++++++++++++++- ...ugin-csit-bulkomatic-clustering-daily.yaml | 5 ++- ...csit-bulkomatic-clustering-perf-daily.yaml | 5 ++- ...flowplugin-csit-bulkomatic-perf-daily.yaml | 5 ++- .../openflowplugin-csit-cbench-daily.yaml | 5 ++- .../openflowplugin-csit-clustering.yaml | 5 ++- ...openflowplugin-csit-flow-services-frs.yaml | 5 ++- .../openflowplugin-csit-flow-services.yaml | 5 ++- ...lowplugin-csit-link-scalability-daily.yaml | 5 ++- .../openflowplugin-csit-longevity.yaml | 5 ++- ...n-csit-restconf-clustering-perf-daily.yaml | 5 ++- ...enflowplugin-csit-restconf-perf-daily.yaml | 5 ++- .../openflowplugin-csit-sanity.yaml | 5 ++- .../openflowplugin-csit-scalability.yaml | 5 ++- ...csit-scale-stats-collection-daily-frs.yaml | 5 ++- ...gin-csit-scale-stats-collection-daily.yaml | 5 ++- ...nflowplugin-csit-sw-scalability-daily.yaml | 5 ++- .../openflowplugin-patch-test.yaml | 5 ++- jjb/openflowplugin/openflowplugin.yaml | 33 ++++++++++++++++- jjb/opflex/opflex-custom.yaml | 5 ++- jjb/opflex/opflex-dependencies.yaml | 10 +++++- jjb/ovsdb/ovsdb-csit-clustering.yaml | 5 ++- jjb/ovsdb/ovsdb-csit-southbound.yaml | 5 ++- jjb/ovsdb/ovsdb-full-integration.yaml | 5 ++- jjb/ovsdb/ovsdb-patch-test.yaml | 5 ++- jjb/ovsdb/ovsdb.yaml | 29 ++++++++++++++- jjb/packetcable/packetcable-csit-pcmm.yaml | 5 ++- jjb/packetcable/packetcable.yaml | 29 ++++++++++++++- jjb/persistence/persistence.yaml | 28 ++++++++++++++- jjb/releng-defaults.yaml | 7 ++++ jjb/reservation/reservation.yaml | 27 +++++++++++++- .../sdninterfaceapp-csit-basic.yaml | 5 ++- jjb/sdninterfaceapp/sdninterfaceapp.yaml | 29 ++++++++++++++- jjb/sfc/sfc-csit-full-deploy.yaml | 5 ++- jjb/sfc/sfc-csit-rest-basic.yaml | 5 ++- jjb/sfc/sfc-patch-test.yaml | 5 ++- jjb/sfc/sfc-python.yaml | 5 ++- jjb/sfc/sfc.yaml | 29 ++++++++++++++- jjb/snbi/snbi.yaml | 29 ++++++++++++++- jjb/snmp/snmp-csit-basic.yaml | 5 ++- jjb/snmp/snmp.yaml | 29 ++++++++++++++- jjb/snmp4sdn/snmp4sdn.yaml | 29 ++++++++++++++- jjb/sxp/sxp-csit-basic.yaml | 5 ++- jjb/sxp/sxp-csit-cluster-routing.yaml | 5 ++- jjb/sxp/sxp-csit-clustering.yaml | 5 ++- jjb/sxp/sxp-csit-filtering.yaml | 5 ++- jjb/sxp/sxp-csit-performance.yaml | 5 ++- jjb/sxp/sxp-csit-topology.yaml | 5 ++- jjb/sxp/sxp.yaml | 29 ++++++++++++++- jjb/systemmetrics/systemmetrics.yaml | 27 +++++++++++++- jjb/tcpmd5/tcpmd5.yaml | 28 ++++++++++++++- ...opoprocessing-csit-topology-operation.yaml | 5 ++- jjb/topoprocessing/topoprocessing.yaml | 29 ++++++++++++++- jjb/transportpce/transportpce.yaml | 27 +++++++++++++- jjb/tsdr/tsdr-csit-cassandra.yaml | 5 ++- jjb/tsdr/tsdr-csit-elasticsearch.yaml | 5 ++- jjb/tsdr/tsdr-csit-hbase.yaml | 5 ++- jjb/tsdr/tsdr-csit-hsqldb.yaml | 5 ++- jjb/tsdr/tsdr.yaml | 29 ++++++++++++++- jjb/ttp/ttp.yaml | 29 ++++++++++++++- jjb/unimgr/unimgr-csit-basic.yaml | 5 ++- jjb/unimgr/unimgr-csit-legato.yaml | 5 ++- jjb/unimgr/unimgr.yaml | 29 ++++++++++++++- jjb/usc/usc-csit-channel.yaml | 5 ++- jjb/usc/usc-csit-tcp.yaml | 5 ++- jjb/usc/usc.yaml | 29 ++++++++++++++- jjb/usecplugin/usecplugin-csit-basic.yaml | 5 ++- jjb/usecplugin/usecplugin.yaml | 29 ++++++++++++++- jjb/vtn/vtn-csit-3node-manager.yaml | 5 ++- jjb/vtn/vtn-csit-coordinator.yaml | 5 ++- jjb/vtn/vtn-csit-manager.yaml | 5 ++- jjb/vtn/vtn-manager-csit-1node-openstack.yaml | 5 ++- jjb/vtn/vtn-patch-test.yaml | 9 +++-- jjb/vtn/vtn.yaml | 33 ++++++++++++++++- jjb/yang-push/yang-push.yaml | 29 ++++++++++++++- jjb/yangide/yangide.yaml | 27 +++++++++++++- jjb/yangtools/yangtools-csit-system.yaml | 5 ++- jjb/yangtools/yangtools.yaml | 29 ++++++++++++++- 187 files changed, 2388 insertions(+), 187 deletions(-) diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index fd55fdb28..807c91240 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml index 2da87cf88..347af910c 100644 --- a/jjb/aaa/aaa-csit-idmlite.yaml +++ b/jjb/aaa/aaa-csit-idmlite.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index cf1bfc1c6..80722ca46 100644 --- a/jjb/aaa/aaa-csit-keystone.yaml +++ b/jjb/aaa/aaa-csit-keystone.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' install: - only: diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml index 11423ffd2..5485dfd94 100644 --- a/jjb/aaa/aaa-csit-tls.yaml +++ b/jjb/aaa/aaa-csit-tls.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' install: - only: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index e4547aff1..c8850a361 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jdk: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jdk: 'openjdk8' feature: - authn: diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 42787db26..feb3cb915 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -1,4 +1,31 @@ --- +- project: + name: aaa-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'aaa' + project-name: 'aaa' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: aaa-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'aaa' project-name: 'aaa' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index de3886864..a1c337240 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index e9fe7bb41..ba01d1516 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -1,4 +1,31 @@ --- +- project: + name: alto-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'alto' + project-name: 'alto' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: alto-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'alto' project-name: 'alto' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml index bf9e326ef..638b914ca 100644 --- a/jjb/armoury/armoury-csit-basic.yaml +++ b/jjb/armoury/armoury-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml index 1f7200826..e40122df4 100644 --- a/jjb/armoury/armoury.yaml +++ b/jjb/armoury/armoury.yaml @@ -1,4 +1,30 @@ --- +- project: + name: armoury-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'armoury' + project-name: 'armoury' + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk7 + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'armoury-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + dependencies: '' + email-upstream: '[armoury]' + archive-artifacts: '' + - project: name: armoury-carbon jobs: @@ -10,7 +36,7 @@ stream: carbon project: 'armoury' project-name: 'armoury' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk7 diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index 04e31cf99..452f71d4d 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -1,4 +1,31 @@ --- +- project: + name: atrium-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'atrium' + project-name: 'atrium' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: atrium-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'atrium' project-name: 'atrium' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index c777c8428..fee1e77df 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -5,9 +5,14 @@ - 'autorelease-release-{stream}' stream: + - nitrogen: + next-release-tag: Nitrogen + branch: 'master' + jdk: 'openjdk8' + integration-test: nitrogen - carbon: next-release-tag: Carbon - branch: 'master' + branch: 'stable/carbon' jdk: 'openjdk8' integration-test: carbon - boron: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index e39426af1..b6b3af9a2 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index a65c61db2..90824d9cb 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 0e6aeaca8..646e7d754 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 81961b4c4..fe238d1e2 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 876e4981e..38e2ba0a9 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 03130a80b..dcd0281e9 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -1,4 +1,37 @@ --- +- project: + name: bgpcep-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'bgpcep' + project-name: 'bgpcep' + build-node: centos7-java-builder-4c-8g + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'bgpcep-settings' + mvn-goals: 'clean -DrepoBuild install javadoc:aggregate' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + mdsal-merge-{stream}, + tcpmd5-merge-{stream} + email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' + archive-artifacts: '' + - project: name: bgpcep-carbon jobs: @@ -13,7 +46,7 @@ project: 'bgpcep' project-name: 'bgpcep' build-node: centos7-java-builder-4c-8g - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index 8c620cee2..6fb0a417b 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' # TODO: Delete the following if suites are compatible with Boron again. verify-stream: 'carbon' diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 50d83c9d9..6ec561ddc 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index c9b3f0903..f6188adea 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -1,4 +1,31 @@ --- +- project: + name: capwap-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'capwap' + project-name: 'capwap' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: capwap-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'capwap' project-name: 'capwap' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 58b08a214..34b2e7e7d 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -1,4 +1,31 @@ --- +- project: + name: cardinal-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'cardinal' + project-name: 'cardinal' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: cardinal-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'cardinal' project-name: 'cardinal' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index eaa5de453..8b965dc8d 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index fac8ade2e..373361eb0 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -1,4 +1,31 @@ --- +- project: + name: centinel-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'centinel' + project-name: 'centinel' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: centinel-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'centinel' project-name: 'centinel' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 2686865d9..c5f74a2ba 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -1,4 +1,29 @@ --- +- project: + name: coe-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + project: 'coe' + project-name: 'coe' + stream: nitrogen + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: coe-carbon jobs: @@ -10,7 +35,7 @@ project: 'coe' project-name: 'coe' stream: carbon - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 970836776..9be47634b 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -12,9 +12,12 @@ # Project branches. Boron for actual testing, Beryllium for sanity. stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index ee70dbfe4..9bbdf02bf 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 721966c05..004b8e7e2 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 44adcb92e..3b72db1e1 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index 608a50c39..6968fd9f3 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' install: - only: diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml index a1fa0f355..0f3dba386 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml index 8ab95ce93..0e46ca42a 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 6ca973443..a31451ce1 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 0537ec216..c3dd221ad 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index cfb0d9081..dbb2dddbc 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -1,4 +1,31 @@ --- +- project: + name: controller-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'controller' + project-name: 'controller' + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'controller-settings' + mvn-goals: 'clean install -Pintegrationtests,docs' + mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' + email-upstream: '[controller] [odlparent] [yangtools] [aaa]' + archive-artifacts: '' + - project: name: controller-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'controller' project-name: 'controller' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index 6f3cc1e15..09860abbf 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -1,4 +1,29 @@ --- +- project: + name: coretutorials-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'coretutorials' + project-name: 'coretutorials' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: coretutorials-carbon jobs: @@ -10,7 +35,7 @@ stream: carbon project: 'coretutorials' project-name: 'coretutorials' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 1c4586b27..cdc5d5a93 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' # yamllint disable-line rule:line-length bundleurl: 'https://jenkins.opendaylight.org/releng/view/daexim/job/daexim-merge-carbon/lastSuccessfulBuild/org.opendaylight.daexim$daexim-karaf/artifact/org.opendaylight.daexim/daexim-karaf/1.0.0-SNAPSHOT/daexim-karaf-1.0.0-SNAPSHOT.zip' diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 0cd2f6de3..eead0a4fd 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -1,4 +1,29 @@ --- +- project: + name: daexim-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + project: 'daexim' + project-name: 'daexim' + stream: nitrogen + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'daexim-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: '[daexim] [odlparent] [yangtools] [controller]' + archive-artifacts: '' + - project: name: daexim-carbon jobs: @@ -10,7 +35,7 @@ project: 'daexim' project-name: 'daexim' stream: carbon - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index bd528f52b..f585f48e3 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index e0eb64055..6efc1c58b 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -1,4 +1,31 @@ --- +- project: + name: didm-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'didm' + project-name: 'didm' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: didm-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'didm' project-name: 'didm' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml index e8b145559..a7e83e8f1 100644 --- a/jjb/discovery/discovery.yaml +++ b/jjb/discovery/discovery.yaml @@ -1,4 +1,29 @@ --- +- project: + name: discovery-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'discovery' + project-name: 'discovery' + branch: 'master' + jdk: openjdk7 + jdks: + - openjdk7 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'discovery-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[discovery]' + archive-artifacts: '' + - project: name: discovery-carbon jobs: @@ -10,7 +35,7 @@ stream: carbon project: 'discovery' project-name: 'discovery' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk7 jdks: - openjdk7 diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 38077fd7e..976feec36 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -1,4 +1,31 @@ --- +- project: + name: dlux-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'dlux' + project-name: 'dlux' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: dlux-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'dlux' project-name: 'dlux' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index afa1ef03f..6dc55f32d 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -1,4 +1,31 @@ --- +- project: + name: dluxapps-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + project: 'dluxapps' + project-name: 'dluxapps' + stream: nitrogen + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: dluxapps-carbon jobs: @@ -12,7 +39,7 @@ project: 'dluxapps' project-name: 'dluxapps' stream: carbon - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 2aef3457a..f06c034e9 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -7,8 +7,11 @@ - '{project-name}-verify-tox-{stream}' stream: - - carbon: + - nitrogen: branch: 'master' + jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' - boron: branch: 'stable/boron' - beryllium: diff --git a/jjb/eman/eman-csit-model.yaml b/jjb/eman/eman-csit-model.yaml index 76a0ffa06..267503c9d 100644 --- a/jjb/eman/eman-csit-model.yaml +++ b/jjb/eman/eman-csit-model.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index 4b889806f..b6bfbf348 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -1,4 +1,31 @@ --- +- project: + name: eman-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'eman' + project-name: 'eman' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: eman-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'eman' project-name: 'eman' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index ff630de93..39af4df88 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -1,4 +1,31 @@ --- +- project: + name: faas-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'faas' + project-name: 'faas' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: faas-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'faas' project-name: 'faas' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index e79069554..a1ec96b8b 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -1,4 +1,31 @@ --- +- project: + name: federation-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-validate-autorelease-{stream}' + + project: 'federation' + project-name: 'federation' + stream: nitrogen + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: federation-carbon jobs: @@ -12,7 +39,7 @@ project: 'federation' project-name: 'federation' stream: carbon - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 75afd356c..084f7b1bc 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 243abe5ed..6cf71d139 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jdk: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jdk: 'openjdk8' - boron: branch: 'stable/boron' jdk: 'openjdk8' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 816e81ace..9fa00f16e 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -1,4 +1,36 @@ --- +- project: + name: genius-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'genius' + project-name: 'genius' + branch: 'master' + jdk: openjdk8 + 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}, + yangtools-merge-{stream}, + odlparent-merge-{stream}, + openflowplugin-merge-{stream}, + neutron-merge-{stream} + email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' + archive-artifacts: '' + - project: name: genius-carbon jobs: @@ -12,7 +44,7 @@ stream: carbon project: 'genius' project-name: 'genius' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index 7c7913813..e38eabadc 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -19,10 +19,14 @@ functionality: 'openstack' stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' + install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index e611d0fd7..8c5c5e798 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index f54fbb8f7..e7009e390 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 6b386c0fc..f575d6456 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index 970722602..a4b6bdfef 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -11,9 +11,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index b0c69d622..f09f9998b 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -1,4 +1,36 @@ --- +- project: + name: groupbasedpolicy-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'groupbasedpolicy' + project-name: 'groupbasedpolicy' + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'groupbasedpolicy-settings' + mvn-goals: '-U clean install findbugs:findbugs' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: > + openflowjava-merge-{stream}, + openflowplugin-merge-{stream}, + neutron-merge-{stream}, + sfc-merge-{stream}, + ovsdb-merge-{stream} + email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' + archive-artifacts: '' + - project: name: groupbasedpolicy-carbon jobs: @@ -12,7 +44,7 @@ stream: carbon project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index 50a1b3797..2b0d709ce 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -1,4 +1,31 @@ --- +- project: + name: vbd-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'honeycomb/vbd' + project-name: 'vbd' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: vbd-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'honeycomb/vbd' project-name: 'vbd' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 09fbf197b..575a9fa6a 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -1,4 +1,31 @@ --- +- project: + name: infrautils-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'infrautils' + project-name: 'infrautils' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: infrautils-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'infrautils' project-name: 'infrautils' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/integration/distribution-jobs.yaml b/jjb/integration/distribution-jobs.yaml index ef584dc92..4a62e56b9 100644 --- a/jjb/integration/distribution-jobs.yaml +++ b/jjb/integration/distribution-jobs.yaml @@ -12,9 +12,12 @@ project-name: distribution stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index a6dcd2efd..f2e5f6b49 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml index ec32f4485..b9ff74d8a 100644 --- a/jjb/integration/distribution/distribution.yaml +++ b/jjb/integration/distribution/distribution.yaml @@ -9,8 +9,11 @@ - distribution-check-{stream} stream: - - carbon: + - nitrogen: branch: 'master' + jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 359bd3f79..e8e396fa8 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -15,8 +15,15 @@ # CSIT Lists in releng-defaults.yaml stream: - - carbon: + - nitrogen: branch: 'master' + jre: 'openjdk8' + csit-list: '{csit-list-nitrogen}' + csit-sanity-list: '{csit-sanity-list-nitrogen}' + csit-weekly-list: '{csit-weekly-list-nitrogen}' + schedule-weekly: 'H 12 * * 0' + - carbon: + branch: 'stable/carbon' jdk: 'openjdk8' jre: 'openjdk8' csit-list: '{csit-list-carbon}' diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index e32fc648e..42cd51471 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -17,9 +17,12 @@ # backward incompatible changes in test suites for Carbon # TODO: Create test suites for specific release before # Carbon if needed. - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' # TODO: Delete the following if suites are compatible with Boron again. verify-stream: 'carbon' diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 65488ba15..44231502d 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -1,4 +1,31 @@ --- +- project: + name: iotdm-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'iotdm' + project-name: 'iotdm' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: iotdm-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'iotdm' project-name: 'iotdm' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 13bfff1e1..ef9192d95 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -1,4 +1,28 @@ --- +- project: + name: jsonrpc-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + project: 'jsonrpc' + project-name: 'jsonrpc' + stream: nitrogen + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: jsonrpc-carbon jobs: @@ -9,7 +33,7 @@ project: 'jsonrpc' project-name: 'jsonrpc' stream: carbon - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 8b53e5536..db65a17e3 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 431bb7090..76ecbbb71 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 0b752da35..be2d089e9 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 52de3b90d..24dfe9c7a 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jdk: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jdk: 'openjdk8' - boron: branch: 'stable/boron' jdk: 'openjdk8' diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 22ab3dab8..4b75a3665 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -1,4 +1,36 @@ --- +- project: + name: l2switch-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'l2switch' + project-name: 'l2switch' + branch: 'master' + jdk: openjdk8 + 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}, + yangtools-merge-{stream}, + controller-merge-{stream}, + openflowjava-merge-{stream}, + openflowplugin-merge-{stream} + email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' + archive-artifacts: '' + - project: name: l2switch-carbon jobs: @@ -12,7 +44,7 @@ stream: carbon project: 'l2switch' project-name: 'l2switch' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index dbe97f6e8..5d184f202 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 7b13db3ae..a9acc22d3 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -1,4 +1,31 @@ --- +- project: + name: lacp-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'lacp' + project-name: 'lacp' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: lacp-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'lacp' project-name: 'lacp' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 1d2d829d7..45e6dd36e 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index 54f832ec3..aab9b0f66 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index ffc89f911..dd9b65b93 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -1,4 +1,32 @@ --- +- project: + name: lispflowmapping-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'lispflowmapping' + project-name: 'lispflowmapping' + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'lispflowmapping-settings' + mvn-goals: 'clean install 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]' + archive-artifacts: '' + build-node: centos7-java-builder-4c-8g + - project: name: lispflowmapping-carbon jobs: @@ -12,7 +40,7 @@ stream: carbon project: 'lispflowmapping' project-name: 'lispflowmapping' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 6c6769295..c91af5044 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -12,9 +12,12 @@ # Project branches. Boron for actual testing, Beryllium for sanity. stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' robot-options: '-v JAVA_OPTIONS:-Xmx6656m' - boron: branch: 'stable/boron' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 2b4c0c381..088b60cc8 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -1,4 +1,31 @@ --- +- project: + name: mdsal-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'mdsal' + project-name: 'mdsal' + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'mdsal-settings' + mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' + email-upstream: '[mdsal] [odlparent] [yangtools]' + archive-artifacts: '' + - project: name: mdsal-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'mdsal' project-name: 'mdsal' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index 59a6952e9..f40f634b3 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 98809b68e..1aacfab22 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -1,4 +1,31 @@ --- +- project: + name: messaging4transport-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'messaging4transport' + project-name: 'messaging4transport' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: messaging4transport-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'messaging4transport' project-name: 'messaging4transport' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml index 9a3c23f46..e1e7b27e4 100644 --- a/jjb/natapp/natapp-csit-basic.yaml +++ b/jjb/natapp/natapp-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 5e913b57b..d8c10e852 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -1,4 +1,31 @@ --- +- project: + name: natapp-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'natapp' + project-name: 'natapp' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: natapp-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'natapp' project-name: 'natapp' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index a0ff85b09..f83ef439e 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index d0f45a6eb..d106107a3 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -1,4 +1,31 @@ --- +- project: + name: nemo-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'nemo' + project-name: 'nemo' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: nemo-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'nemo' project-name: 'nemo' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml index 33d82c12e..b7abddaa9 100644 --- a/jjb/netconf/netconf-cluster-stress.yaml +++ b/jjb/netconf/netconf-cluster-stress.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index a8b8adf53..4150339bb 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index b33e0f0be..6db95f8bd 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 53b5ebcd5..c05e67317 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 66bb26655..54a9ec27a 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 9ea3d0301..4e0115749 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -1,4 +1,31 @@ --- +- project: + name: netconf-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'netconf' + project-name: 'netconf' + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'netconf-settings' + mvn-goals: 'clean install -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]' + archive-artifacts: '' + - project: name: netconf-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'netconf' project-name: 'netconf' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index b6917ee7e..0fcf193d7 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 52ba702b6..4ad177426 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -1,4 +1,31 @@ --- +- project: + name: netide-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'netide' + project-name: 'netide' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: netide-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'netide' project-name: 'netide' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 316a89c0a..f7c042334 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -49,9 +49,12 @@ testplan: '{project}-{topology}-tempest-openstack.txt' stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index ae1560b10..00c0e6fbc 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -49,9 +49,12 @@ testplan: '{project}-{topology}-tempest-openstack.txt' stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index 73a0c9f08..ad53c5328 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -5,8 +5,11 @@ - 'netvirt-daily-full-integration-{stream}' stream: - - carbon: + - nitrogen: branch: 'master' + jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 154224933..d726c0fba 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jdk: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jdk: 'openjdk8' - boron: branch: 'stable/boron' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 292f3cce9..4a40f1493 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -1,4 +1,37 @@ --- +- project: + name: netvirt-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'netvirt' + project-name: 'netvirt' + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'netvirt-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' + dependencies: > + genius-merge-{stream}, + neutron-merge-{stream}, + openflowjava-merge-{stream}, + openflowplugin-merge-{stream}, + ovsdb-merge-{stream}, + sfc-merge-{stream} + email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]' + archive-artifacts: '' + - project: name: netvirt-carbon jobs: @@ -12,7 +45,7 @@ stream: carbon project: 'netvirt' project-name: 'netvirt' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index c775346fb..4eb63b612 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -1,4 +1,32 @@ --- +- project: + name: neutron-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'neutron' + project-name: 'neutron' + build-timeout: 60 + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: neutron-carbon jobs: @@ -13,7 +41,7 @@ project: 'neutron' project-name: 'neutron' build-timeout: 60 - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 444967990..7ab0b5a19 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -1,4 +1,31 @@ --- +- project: + name: next-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'next' + project-name: 'next' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: next-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'next' project-name: 'next' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index 962eddf5a..ed3e98215 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml index 29c1fc387..c6db4387b 100644 --- a/jjb/nic/nic-csit-vtnrenderer.yaml +++ b/jjb/nic/nic-csit-vtnrenderer.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index db0e5fcd8..51f8a18f0 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -1,4 +1,31 @@ --- +- project: + name: nic-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'nic' + project-name: 'nic' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: nic-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'nic' project-name: 'nic' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml index a0a5acdbb..6b6cc324d 100644 --- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml index 300a8fb1f..bb5809fb0 100644 --- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index c7e45b2ea..728f00bd1 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -1,4 +1,31 @@ --- +- project: + name: ocpplugin-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'ocpplugin' + project-name: 'ocpplugin' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: ocpplugin-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'ocpplugin' project-name: 'ocpplugin' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 6e84bea1f..35adcbff6 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -1,4 +1,32 @@ --- +- project: + name: odlparent-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-verify-tox-{stream}' + + stream: nitrogen + project: 'odlparent' + project-name: 'odlparent' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: odlparent-carbon jobs: @@ -13,7 +41,7 @@ stream: carbon project: 'odlparent' project-name: 'odlparent' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml index b1fdc626f..56458ff4a 100644 --- a/jjb/of-config/of-config-csit-basic.yaml +++ b/jjb/of-config/of-config-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 7796a8c69..c02f9eb5f 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -1,4 +1,31 @@ --- +- project: + name: of-config-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'of-config' + project-name: 'of-config' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: of-config-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'of-config' project-name: 'of-config' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index ccd0d86c4..ca6bcac41 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -1,4 +1,29 @@ --- +- project: + name: circuitsw-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'ofextensions/circuitsw' + project-name: 'circuitsw' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: circuitsw-carbon jobs: @@ -10,7 +35,7 @@ stream: carbon project: 'ofextensions/circuitsw' project-name: 'circuitsw' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index 5108ae5b4..d5242d379 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -1,4 +1,31 @@ --- +- project: + name: openflowjava-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'openflowjava' + project-name: 'openflowjava' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: openflowjava-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'openflowjava' project-name: 'openflowjava' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml index ba8917f44..b2d6ee43e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml index d5d9eff14..bca0ee345 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml index 5bfe2e28b..b337e58a4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml index a0ebbad81..7f249ab4f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index ee61b31bd..afb19c922 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml index a93fbbbcd..73641de36 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-frs.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 45e0c6b3d..e141f08a8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml index 4f2804e21..991b352ef 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 6ecd77dc0..41c069444 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml index 7fe6ed19d..3754da4ae 100644 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml index 3b0b342dc..e7b516437 100644 --- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 5dfec9d0e..9e5462c2a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml index 2e7c2a625..1d659a4c1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml index 030139867..732b09cb1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml index 68703fc76..1fe32c1dd 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml index 685664a61..a2abd6f3d 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 034eced4f..2b5b56402 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jdk: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jdk: 'openjdk8' - boron: branch: 'stable/boron' jdk: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 9723455e0..8c6c18025 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -1,4 +1,35 @@ --- +- project: + name: openflowplugin-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'openflowplugin' + project-name: 'openflowplugin' + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'openflowplugin-settings' + mvn-goals: 'clean install javadoc:aggregate' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + openflowjava-merge-{stream} + email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' + archive-artifacts: 'model/*/target/site/**' + - project: name: openflowplugin-carbon jobs: @@ -12,7 +43,7 @@ stream: carbon project: 'openflowplugin' project-name: 'openflowplugin' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index aad0b09e6..a952b8a7b 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -6,9 +6,12 @@ - 'opflex-merge-{stream}' stream: - - carbon: + - nitrogen: branch: 'master' jdk: openjdk8 + - carbon: + branch: 'stable/carbon' + jdk: openjdk8 - boron: branch: 'stable/boron' jdk: openjdk8 diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml index a932a9c84..a96223406 100644 --- a/jjb/opflex/opflex-dependencies.yaml +++ b/jjb/opflex/opflex-dependencies.yaml @@ -7,7 +7,7 @@ - 'opflex-openvswitch_tgz-{stream}' stream: - - carbon: + - nitrogen: branch: 'master' libuv-build: v1 libuv-scm: v2 @@ -15,6 +15,14 @@ rapidjson-scm: v2 openvswitch-build: v2 openvswitch-scm: v2 + - carbon: + branch: 'stable/carbon' + libuv-build: v1 + libuv-scm: v2 + rapidjson-build: v1 + rapidjson-scm: v2 + openvswitch-build: v2 + openvswitch-scm: v2 - boron: branch: 'stable/boron' libuv-build: v1 diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 1608c00b6..2514943aa 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 142e5e28d..16e13831a 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -14,9 +14,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index f0eaa9946..bc0c2c723 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -5,8 +5,11 @@ - 'ovsdb-daily-full-integration-{stream}' stream: - - carbon: + - nitrogen: branch: 'master' + jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 53fca6730..427bdcb46 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -8,9 +8,12 @@ project: 'ovsdb' stream: - - carbon: + - nitrogen: branch: 'master' jdk: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jdk: 'openjdk8' - boron: branch: 'stable/boron' jdk: 'openjdk8' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index bdbafe4d2..f16d1652c 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -1,4 +1,31 @@ --- +- project: + name: ovsdb-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'ovsdb' + project-name: 'ovsdb' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: ovsdb-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'ovsdb' project-name: 'ovsdb' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index fda260c84..aa6304a82 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index b97ce62d7..7a78a5559 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -1,4 +1,31 @@ --- +- project: + name: packetcable-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'packetcable' + project-name: 'packetcable' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: packetcable-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'packetcable' project-name: 'packetcable' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index e77a78d6b..950a74bec 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -1,4 +1,30 @@ --- +- project: + name: persistence-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'persistence' + 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]' + archive-artifacts: '' + - project: name: persistence-carbon jobs: @@ -10,7 +36,7 @@ stream: carbon project: 'persistence' project-name: 'persistence' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk7 jdks: - openjdk7 diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index a640b5f42..b37f5bbba 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -142,10 +142,17 @@ # Manual CSIT job lists used by sanity # and weekly distribution test jobs + csit-sanity-list-nitrogen: > + openflowplugin-csit-1node-sanity-only-nitrogen csit-sanity-list-carbon: > openflowplugin-csit-1node-sanity-only-carbon csit-sanity-list-boron: > openflowplugin-csit-1node-sanity-only-boron + csit-weekly-list-nitrogen: > + controller-csit-1node-notifications-longevity-only-nitrogen, + controller-csit-3node-drb-partnheal-longevity-only-nitrogen, + controller-csit-3node-drb-precedence-longevity-only-nitrogen, + openflowplugin-csit-1node-periodic-longevity-only-nitrogen csit-weekly-list-carbon: > controller-csit-1node-notifications-longevity-only-carbon, controller-csit-3node-drb-partnheal-longevity-only-carbon, diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index f3740a057..48ded16a6 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -1,4 +1,29 @@ --- +- project: + name: reservation-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'reservation' + project-name: 'reservation' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: reservation-carbon jobs: @@ -10,7 +35,7 @@ stream: carbon project: 'reservation' project-name: 'reservation' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index 513b1dbc1..b656769b2 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 97219042b..31a7d7084 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -1,4 +1,31 @@ --- +- project: + name: sdninterfaceapp-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'sdninterfaceapp' + project-name: 'sdninterfaceapp' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: sdninterfaceapp-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index 711de2c31..79746bf45 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' install: - only: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index 2833782c3..b574a85ba 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index f7aab46ed..0b14612fd 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -9,9 +9,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jdk: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jdk: 'openjdk8' feature: - basic: diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index d61f6b79b..ee2489e76 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -7,8 +7,11 @@ # stream: release stream (eg. stable-boron or beryllium) # branch: git branch (eg. stable/boron or master) stream: - - carbon: + - nitrogen: branch: 'master' + jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' - boron: branch: 'stable/boron' - beryllium: diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 0816d98e2..dbac35d27 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -1,4 +1,31 @@ --- +- project: + name: sfc-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'sfc' + project-name: 'sfc' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: sfc-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'sfc' project-name: 'sfc' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index fec71d89f..0834978a8 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -1,4 +1,31 @@ --- +- project: + name: snbi-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'snbi' + project-name: 'snbi' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: snbi-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'snbi' project-name: 'snbi' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml index e4d123d1b..feaadb60c 100644 --- a/jjb/snmp/snmp-csit-basic.yaml +++ b/jjb/snmp/snmp-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 5503ffdd9..7db03f573 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -1,4 +1,31 @@ --- +- project: + name: snmp-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'snmp' + project-name: 'snmp' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: snmp-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'snmp' project-name: 'snmp' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index fb444e2e3..c70c3a90f 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -1,4 +1,31 @@ --- +- project: + name: snmp4sdn-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'snmp4sdn' + project-name: 'snmp4sdn' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: snmp4sdn-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'snmp4sdn' project-name: 'snmp4sdn' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 414d668ad..4fc6b2208 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml index c32e756e8..eba3bd596 100644 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ b/jjb/sxp/sxp-csit-cluster-routing.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' install: - only: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index d0834f40a..4492e7ecb 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index b634427c8..b2ab9b500 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 2a4081709..39859880b 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' install: - only: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 577c41882..b1a86a774 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -12,9 +12,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 31e894bc1..f233596d6 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -1,4 +1,31 @@ --- +- project: + name: sxp-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'sxp' + project-name: 'sxp' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: sxp-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'sxp' project-name: 'sxp' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index c65b6919d..a97bf69bd 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -1,4 +1,29 @@ --- +- project: + name: systemmetrics-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + project: 'systemmetrics' + project-name: 'systemmetrics' + stream: nitrogen + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: systemmetrics-carbon jobs: @@ -10,7 +35,7 @@ project: 'systemmetrics' project-name: 'systemmetrics' stream: carbon - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml index 33e543297..d38d6f47d 100644 --- a/jjb/tcpmd5/tcpmd5.yaml +++ b/jjb/tcpmd5/tcpmd5.yaml @@ -1,4 +1,30 @@ --- +- project: + name: tcpmd5-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'tcpmd5' + project-name: 'tcpmd5' + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk8 + + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'tcpmd5-settings' + mvn-goals: 'clean -DrepoBuild install javadoc:aggregate' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' + email-upstream: '[tcpmd5] [odlparent] [yangtools] [controller]' + archive-artifacts: '' + - project: name: tcpmd5-carbon jobs: @@ -10,7 +36,7 @@ stream: carbon project: 'tcpmd5' project-name: 'tcpmd5' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index e93045fce..ebb8a8f48 100644 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 9177b5289..fcc51b7af 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -1,4 +1,31 @@ --- +- project: + name: topoprocessing-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'topoprocessing' + project-name: 'topoprocessing' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: topoprocessing-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'topoprocessing' project-name: 'topoprocessing' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 52502dc9b..37726167c 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -1,4 +1,29 @@ --- +- project: + name: transportpce-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + project: 'transportpce' + project-name: 'transportpce' + stream: nitrogen + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: transportpce-carbon jobs: @@ -10,7 +35,7 @@ project: 'transportpce' project-name: 'transportpce' stream: carbon - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index f9b18a572..fbd793f47 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 974b5594a..b4dcbf241 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' install: - only: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index c35208448..54c2ccb7c 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index d34fb0494..4de2fe4dc 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 095d98438..127d46273 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -1,4 +1,31 @@ --- +- project: + name: tsdr-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'tsdr' + project-name: 'tsdr' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: tsdr-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'tsdr' project-name: 'tsdr' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 26b1598b3..86cfe80ce 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -1,4 +1,31 @@ --- +- project: + name: ttp-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'ttp' + project-name: 'ttp' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: ttp-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'ttp' project-name: 'ttp' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml index 1310c4f71..f537bcf22 100644 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ b/jjb/unimgr/unimgr-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml index d374f188c..973a1a9fc 100644 --- a/jjb/unimgr/unimgr-csit-legato.yaml +++ b/jjb/unimgr/unimgr-csit-legato.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 3f692b74a..983333125 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -1,4 +1,31 @@ --- +- project: + name: unimgr-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'unimgr' + project-name: 'unimgr' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: unimgr-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'unimgr' project-name: 'unimgr' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 516ff2cf7..030b52586 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 128ce4220..cd87d4754 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 32ae9455a..1b9edf438 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -1,4 +1,31 @@ --- +- project: + name: usc-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'usc' + project-name: 'usc' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: usc-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'usc' project-name: 'usc' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index 9e9225830..dae05f071 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index 8b13afb20..af91d9dbe 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -1,4 +1,31 @@ --- +- project: + name: usecplugin-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'usecplugin' + project-name: 'usecplugin' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: usecplugin-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'usecplugin' project-name: 'usecplugin' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml index b6864b656..70fac7b56 100644 --- a/jjb/vtn/vtn-csit-3node-manager.yaml +++ b/jjb/vtn/vtn-csit-3node-manager.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index 033f82f50..d1df4c731 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300 - boron: branch: 'stable/boron' diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index b1e55ad5d..96d10bcfc 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -13,9 +13,12 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml index 960e64f6d..6b56eaba8 100644 --- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml +++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml @@ -20,9 +20,12 @@ functionality: 'neutron' stream: - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' - boron: branch: 'stable/boron' jre: 'openjdk8' diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml index a19aaa85c..6ce6addca 100644 --- a/jjb/vtn/vtn-patch-test.yaml +++ b/jjb/vtn/vtn-patch-test.yaml @@ -11,13 +11,18 @@ # Project branches stream: - - carbon: + - nitrogen: branch: 'master' jdk: 'openjdk8' csit-list: > vtn-csit-1node-manager-only-{stream}, vtn-csit-3node-manager-only-{stream} - + - carbon: + branch: 'stable/carbon' + jdk: 'openjdk8' + csit-list: > + vtn-csit-1node-manager-only-{stream}, + vtn-csit-3node-manager-only-{stream} - boron: branch: 'stable/boron' jdk: 'openjdk8' diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index ce28ce30c..377242101 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -1,4 +1,35 @@ --- +- project: + name: vtn-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'vtn' + project-name: 'vtn' + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'vtn-settings' + mvn-goals: 'clean install -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]' + + # Please do not archive maven sites!!! + # Maven sites are published to Nexus at: + # https://nexus.opendaylight.org/content/sites/site/ + archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2' + - project: name: vtn-carbon jobs: @@ -12,7 +43,7 @@ stream: carbon project: 'vtn' project-name: 'vtn' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index 31b89fdec..610165962 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -1,4 +1,31 @@ --- +- project: + name: yang-push-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'yang-push' + project-name: 'yang-push' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: yang-push-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'yang-push' project-name: 'yang-push' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index e40378e5e..f6aa2617f 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -1,4 +1,29 @@ --- +- project: + name: yangide-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'yangide' + project-name: 'yangide' + branch: 'master' + jdk: openjdk8 + 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]' + archive-artifacts: '' + - project: name: yangide-carbon jobs: @@ -10,7 +35,7 @@ stream: carbon project: 'yangide' project-name: 'yangide' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index f00e35ec6..fbbccaca4 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -13,9 +13,12 @@ # Project branches. stream: # The tested component was only introduced in Carbon. - - carbon: + - nitrogen: branch: 'master' jre: 'openjdk8' + - carbon: + branch: 'stable/carbon' + jre: 'openjdk8' install: - only: diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 6dd2316fb..fc0f74584 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -1,4 +1,31 @@ --- +- project: + name: yangtools-nitrogen + jobs: + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' + + stream: nitrogen + project: 'yangtools' + project-name: 'yangtools' + branch: 'master' + jdk: openjdk8 + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: 'mvn33' + mvn-settings: 'yangtools-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: 'odlparent-merge-{stream}' + email-upstream: '[yangtools] [odlparent]' + archive-artifacts: '' + - project: name: yangtools-carbon jobs: @@ -12,7 +39,7 @@ stream: carbon project: 'yangtools' project-name: 'yangtools' - branch: 'master' + branch: 'stable/carbon' jdk: openjdk8 jdks: - openjdk8 -- 2.36.6