From 7a397460a4ddc2688675322b0963704500ec3e94 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 14 Jan 2016 14:59:53 -0500 Subject: [PATCH] Stable Boron branch cutting - Remove pre-boron jobs - Create boron jobs - Change beryllium to build stable/beryllium Change-Id: If646d01a23251ccd004a0b995ddb2d20ce10b910 Signed-off-by: Thanh Ha --- jjb/aaa/aaa-csit-authn.yaml | 4 +- jjb/aaa/aaa-csit-idmlite.yaml | 4 +- jjb/aaa/aaa.cfg | 7 +-- jjb/alto/alto-csit-setup.yaml | 4 +- jjb/alto/alto.cfg | 7 +-- jjb/armoury/armoury-csit-basic.yaml | 4 +- jjb/armoury/armoury.cfg | 6 +-- jjb/autorelease/autorelease-projects.yaml | 6 ++- jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 4 +- jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 4 +- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 4 +- jjb/bgpcep/bgpcep-python.yaml | 4 +- jjb/bgpcep/bgpcep.cfg | 7 +-- jjb/capwap/capwap-csit-ac.yaml | 4 +- jjb/capwap/capwap.cfg | 6 +-- jjb/centinel/centinel-csit-basic.yaml | 4 +- jjb/centinel/centinel.cfg | 7 +-- .../controller-csit-clustering.yaml | 4 +- .../controller-csit-rest-cars-perf.yaml | 4 +- jjb/controller/controller.cfg | 7 +-- jjb/coretutorials/coretutorials.cfg | 5 +- jjb/defense4all/defense4all.cfg | 5 +- jjb/didm/didm.cfg | 7 +-- jjb/discovery/discovery.cfg | 5 +- jjb/dlux/dlux.cfg | 7 +-- jjb/docs/docs.cfg | 7 +-- jjb/faas/faas.cfg | 7 +-- .../groupbasedpolicy-csit-3node.yaml | 4 +- .../groupbasedpolicy-csit-6node.yaml | 4 +- .../groupbasedpolicy-csit-clustering.yaml | 4 +- jjb/groupbasedpolicy/groupbasedpolicy.cfg | 7 +-- jjb/integration/distribution/distribution.cfg | 6 ++- jjb/integration/integration-csit-basic.yaml | 4 +- .../integration-distribution-jobs.yaml | 8 ++- jjb/integration/integration-test-jobs.yaml | 51 ++++++++++++++++++- jjb/iotdm/iotdm-csit-basic.yaml | 4 +- jjb/iotdm/iotdm.cfg | 7 +-- .../l2switch-csit-host-scalability-daily.yaml | 4 +- jjb/l2switch/l2switch-csit-scalability.yaml | 4 +- jjb/l2switch/l2switch-csit-switch.yaml | 4 +- jjb/l2switch/l2switch.cfg | 7 +-- jjb/lacp/lacp-csit-lacp.yaml | 4 +- jjb/lacp/lacp.cfg | 7 +-- .../lispflowmapping-csit-msmr.yaml | 4 +- .../lispflowmapping-csit-performance.yaml | 4 +- jjb/lispflowmapping/lispflowmapping.cfg | 7 +-- ...l-csit-periodic-dsbenchmark-beryllium.yaml | 4 +- jjb/mdsal/mdsal.cfg | 7 +-- .../messaging4transport.cfg | 7 +-- jjb/nemo/nemo-csit-engine.yaml | 4 +- jjb/nemo/nemo.cfg | 7 +-- jjb/netconf/netconf-scale.yaml | 4 +- jjb/netconf/netconf-userfeatures.yaml | 4 +- jjb/netconf/netconf.cfg | 7 +-- jjb/netide/netide-csit-basic.yaml | 4 +- jjb/netide/netide.cfg | 7 +-- jjb/neutron/neutron.cfg | 7 +-- jjb/next/next.cfg | 7 +-- jjb/nic/nic-csit-basic.yaml | 4 +- jjb/nic/nic.cfg | 7 +-- jjb/odlparent/odlparent.cfg | 7 +-- jjb/of-config/of-config.cfg | 7 +-- jjb/ofextensions/circuitsw/circuitsw.cfg | 6 +-- jjb/openflowjava/openflowjava.cfg | 7 +-- ...-bulk-matic-ds-daily-lithium-redesign.yaml | 4 +- ...enflowplugin-csit-bulk-matic-ds-daily.yaml | 4 +- .../openflowplugin-csit-cbench-daily.yaml | 4 +- ...t-cbench-performance-lithium-redesign.yaml | 4 +- ...penflowplugin-csit-cbench-performance.yaml | 4 +- .../openflowplugin-csit-clustering.yaml | 4 +- ...t-config-performance-lithium-redesign.yaml | 4 +- ...penflowplugin-csit-config-performance.yaml | 4 +- ...owplugin-csit-flow-services-beryllium.yaml | 4 +- ...n-csit-flow-services-lithium-redesign.yaml | 4 +- ...nk-scalability-daily-lithium-redesign.yaml | 4 +- ...lowplugin-csit-link-scalability-daily.yaml | 4 +- ...lugin-csit-longevity-lithium-redesign.yaml | 4 +- .../openflowplugin-csit-longevity.yaml | 4 +- ...c-time-measure-daily-lithium-redesign.yaml | 4 +- ...lowplugin-csit-rpc-time-measure-daily.yaml | 4 +- ...it-scalability-daily-lithium-redesign.yaml | 4 +- ...openflowplugin-csit-scalability-daily.yaml | 4 +- ...gin-csit-scalability-lithium-redesign.yaml | 4 +- .../openflowplugin-csit-scalability.yaml | 4 +- ...ats-collection-daily-lithium-redesign.yaml | 4 +- ...gin-csit-scale-stats-collection-daily.yaml | 4 +- ...sit-statistics-basic-lithium-redesign.yaml | 4 +- ...sw-scalability-daily-lithium-redesign.yaml | 4 +- ...nflowplugin-csit-sw-scalability-daily.yaml | 4 +- jjb/openflowplugin/openflowplugin.cfg | 7 +-- jjb/opflex/opflex-custom.yaml | 7 ++- jjb/opflex/opflex-dependencies-rpm.yaml | 7 ++- jjb/opflex/opflex-dependencies.yaml | 7 ++- jjb/ovsdb/ovsdb-csit-clustering.yaml | 4 +- jjb/ovsdb/ovsdb-csit-netvirt.yaml | 4 +- jjb/ovsdb/ovsdb-csit-scalability-daily.yaml | 4 +- jjb/ovsdb/ovsdb-csit-southbound.yaml | 4 +- jjb/ovsdb/ovsdb-full-integration.yaml | 7 ++- jjb/ovsdb/ovsdb.cfg | 7 +-- jjb/packetcable/packetcable-csit-pcmm.yaml | 4 +- jjb/packetcable/packetcable.cfg | 7 +-- jjb/persistence/persistence.cfg | 5 +- jjb/reservation/reservation.cfg | 7 +-- .../sdninterfaceapp-csit-basic.yaml | 4 +- jjb/sdninterfaceapp/sdninterfaceapp.cfg | 7 +-- jjb/sfc/sfc-csit-clustering.yaml | 4 +- jjb/sfc/sfc-python.yaml | 4 +- jjb/sfc/sfc.cfg | 7 +-- jjb/snbi/snbi.cfg | 7 +-- jjb/snmp/snmp-csit-basic.yaml | 4 +- jjb/snmp/snmp.cfg | 7 +-- jjb/snmp4sdn/snmp4sdn.cfg | 7 +-- jjb/spectrometer/spectrometer-python.yaml | 2 +- jjb/sxp/sxp-csit-basic.yaml | 4 +- jjb/sxp/sxp-csit-topology.yaml | 4 +- jjb/sxp/sxp.cfg | 7 +-- jjb/tcpmd5/tcpmd5.cfg | 7 +-- jjb/toolkit/toolkit.cfg | 5 +- ...opoprocessing-csit-topology-operation.yaml | 4 +- jjb/topoprocessing/topoprocessing.cfg | 7 +-- jjb/tsdr/tsdr-csit-h2.yaml | 4 +- jjb/tsdr/tsdr-csit-hbase.yaml | 4 +- jjb/tsdr/tsdr.cfg | 7 +-- jjb/ttp/ttp.cfg | 7 +-- jjb/unimgr/unimgr-csit-basic.yaml | 4 +- jjb/unimgr/unimgr.cfg | 7 +-- jjb/usc/usc-csit-channel.yaml | 4 +- jjb/usc/usc.cfg | 7 +-- jjb/usecplugin/usecplugin-csit-basic.yaml | 4 +- jjb/usecplugin/usecplugin.cfg | 7 +-- .../vpnservice-csit-vpnservice.yaml | 4 +- jjb/vpnservice/vpnservice.cfg | 7 +-- jjb/vtn/vtn-csit-coordinator.yaml | 4 +- jjb/vtn/vtn-csit-manager.yaml | 4 +- jjb/vtn/vtn.cfg | 7 +-- jjb/yang-push/yang-push.cfg | 7 +-- jjb/yangtools/yangtools-verify.yaml | 6 +-- jjb/yangtools/yangtools.cfg | 7 +-- 138 files changed, 526 insertions(+), 242 deletions(-) diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index be5a4bd7e..9ef0c6a1a 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml index 3f61cf095..18f0c0f99 100644 --- a/jjb/aaa/aaa-csit-idmlite.yaml +++ b/jjb/aaa/aaa-csit-idmlite.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/aaa/aaa.cfg b/jjb/aaa/aaa.cfg index cbd3ee27f..242f324a3 100644 --- a/jjb/aaa/aaa.cfg +++ b/jjb/aaa/aaa.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index e4be41336..6e487344a 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/alto/alto.cfg b/jjb/alto/alto.cfg index 185b32b63..90531b5c8 100644 --- a/jjb/alto/alto.cfg +++ b/jjb/alto/alto.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml index defa8fc89..e91d6c105 100644 --- a/jjb/armoury/armoury-csit-basic.yaml +++ b/jjb/armoury/armoury-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/armoury/armoury.cfg b/jjb/armoury/armoury.cfg index 3cecb364f..6fe768020 100644 --- a/jjb/armoury/armoury.cfg +++ b/jjb/armoury/armoury.cfg @@ -1,9 +1,9 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk8,openjdk7 -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk8,openjdk7 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true DEPENDENCIES: odlparent,yangtools,controller,mdsal diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index db908131b..86c72dfbb 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -7,9 +7,13 @@ - 'autorelease-site-verify-{stream}' stream: - - beryllium: + - boron: branch: 'master' jdk: 'openjdk8' + integration-test: boron + - beryllium: + branch: 'stable/beryllium' + jdk: 'openjdk8' integration-test: beryllium - lithium: branch: 'stable/lithium' diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 799dbae4d..b0ba0ec7b 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 6a499cb9a..cfbc4180f 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index cc3bb4057..37033e5df 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/bgpcep/bgpcep-python.yaml b/jjb/bgpcep/bgpcep-python.yaml index c7119d2d5..d4a297574 100644 --- a/jjb/bgpcep/bgpcep-python.yaml +++ b/jjb/bgpcep/bgpcep-python.yaml @@ -6,8 +6,10 @@ # stream: release stream (eg. stable-lithium or beryllium) # branch: git branch (eg. stable/lithium or master) stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg index 0f79755ad..0d2b76727 100644 --- a/jjb/bgpcep/bgpcep.cfg +++ b/jjb/bgpcep/bgpcep.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 3ef607559..bc56921cf 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/capwap/capwap.cfg b/jjb/capwap/capwap.cfg index c1d6dbb7c..1e2e1ed7c 100644 --- a/jjb/capwap/capwap.cfg +++ b/jjb/capwap/capwap.cfg @@ -1,9 +1,9 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 -- pre-boron: - branch: pre-boron +- beryllium: + branch: beryllium jdks: openjdk7,openjdk8 - stable-lithium: branch: stable/lithium diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index c813b1d5a..b1151e725 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/centinel/centinel.cfg b/jjb/centinel/centinel.cfg index beeb4c154..0708008fe 100644 --- a/jjb/centinel/centinel.cfg +++ b/jjb/centinel/centinel.cfg @@ -1,9 +1,10 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true DEPENDENCIES: odlparent,controller,yangtools diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 9004ab113..9af7c4801 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 89322dfd7..49c1c4a50 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg index 3fd75b109..341287fb3 100644 --- a/jjb/controller/controller.cfg +++ b/jjb/controller/controller.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/coretutorials/coretutorials.cfg b/jjb/coretutorials/coretutorials.cfg index a467865d3..f47778a04 100644 --- a/jjb/coretutorials/coretutorials.cfg +++ b/jjb/coretutorials/coretutorials.cfg @@ -1,7 +1,10 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7 +- beryllium: + branch: stable/beryllium + jdks: openjdk7 - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/defense4all/defense4all.cfg b/jjb/defense4all/defense4all.cfg index ae3d9a4c8..7312628e7 100644 --- a/jjb/defense4all/defense4all.cfg +++ b/jjb/defense4all/defense4all.cfg @@ -1,7 +1,10 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7 +- beryllium: + branch: stable/beryllium + jdks: openjdk7 - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/didm/didm.cfg b/jjb/didm/didm.cfg index c07856ed2..17c8ebabf 100644 --- a/jjb/didm/didm.cfg +++ b/jjb/didm/didm.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/discovery/discovery.cfg b/jjb/discovery/discovery.cfg index eb87e8c8b..0c84df3e8 100644 --- a/jjb/discovery/discovery.cfg +++ b/jjb/discovery/discovery.cfg @@ -1,5 +1,8 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7 +- beryllium: + branch: stable/beryllium + jdks: openjdk7 DEPENDENCIES: odlparent diff --git a/jjb/dlux/dlux.cfg b/jjb/dlux/dlux.cfg index b7e79a5d1..98da554a4 100644 --- a/jjb/dlux/dlux.cfg +++ b/jjb/dlux/dlux.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/docs/docs.cfg b/jjb/docs/docs.cfg index b7e79a5d1..98da554a4 100644 --- a/jjb/docs/docs.cfg +++ b/jjb/docs/docs.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/faas/faas.cfg b/jjb/faas/faas.cfg index 90638fa47..9eb7e0148 100644 --- a/jjb/faas/faas.cfg +++ b/jjb/faas/faas.cfg @@ -1,9 +1,10 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true DEPENDENCIES: controller,yangtools,odlparent diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index cad55f3a2..c19515180 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 604b80123..f330303b0 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index c66cb5ed8..fc5c48734 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.cfg b/jjb/groupbasedpolicy/groupbasedpolicy.cfg index 533e14d87..c6e3292e3 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.cfg +++ b/jjb/groupbasedpolicy/groupbasedpolicy.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/integration/distribution/distribution.cfg b/jjb/integration/distribution/distribution.cfg index faca08da6..3dbcb82cd 100644 --- a/jjb/integration/distribution/distribution.cfg +++ b/jjb/integration/distribution/distribution.cfg @@ -1,6 +1,10 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk8,openjdk7 autorelease: true +- beryllium: + branch: stable/beryllium + jdks: openjdk8,openjdk7 + autorelease: true JOB_TEMPLATES: sonar diff --git a/jjb/integration/integration-csit-basic.yaml b/jjb/integration/integration-csit-basic.yaml index c4ed20c51..432747921 100644 --- a/jjb/integration/integration-csit-basic.yaml +++ b/jjb/integration/integration-csit-basic.yaml @@ -14,8 +14,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml index fd2deac2e..e85e6374f 100644 --- a/jjb/integration/integration-distribution-jobs.yaml +++ b/jjb/integration/integration-distribution-jobs.yaml @@ -9,14 +9,12 @@ - 'integration-patch-distribution-{stream}' stream: - - pre-boron: - branch: 'pre-boron' - - beryllium: + - boron: branch: 'master' - + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' - - stable-helium: branch: 'stable/helium' diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index ef50a8c6f..cf0c9fae1 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -9,7 +9,7 @@ - 'integration-multipatch-test-{stream}' stream: - - beryllium: + - boron: branch: 'master' csit-list: > aaa-csit-1node-authn-only-{stream}, @@ -58,6 +58,55 @@ vpnservice-csit-1node-vpnservice-only-{stream}, vpnservice-csit-1node-vpnservice-all-{stream} + - beryllium: + branch: 'stable/beryllium' + csit-list: > + aaa-csit-1node-authn-only-{stream}, + aaa-csit-1node-authn-all-{stream}, + bgpcep-csit-1node-userfeatures-only-{stream}, + bgpcep-csit-1node-userfeatures-all-{stream}, + capwap-csit-1node-ac-only-{stream}, + capwap-csit-1node-ac-all-{stream}, + controller-csit-3node-clustering-only-{stream}, + controller-csit-3node-clustering-all-{stream}, + integration-csit-3node-basic-only-{stream}, + integration-csit-3node-basic-all-{stream}, + integration-distribution-offline-{stream}, + l2switch-csit-1node-switch-only-{stream}, + l2switch-csit-1node-switch-all-{stream}, + l2switch-csit-1node-scalability-only-{stream}, + l2switch-csit-1node-scalability-all-{stream}, + lispflowmapping-csit-1node-msmr-only-{stream}, + lispflowmapping-csit-1node-msmr-all-{stream}, + nic-csit-1node-basic-all-{stream}, + nic-csit-1node-basic-only-{stream}, + openflowplugin-csit-1node-flow-services-only-{stream}, + openflowplugin-csit-1node-flow-services-lithium-redesign-only-{stream}, + openflowplugin-csit-1node-flow-services-all-{stream}, + openflowplugin-csit-1node-scalability-only-{stream}, + openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream}, + openflowplugin-csit-1node-scalability-all-{stream}, + openflowplugin-csit-1node-cbench-performance-only-{stream}, + openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream}, + openflowplugin-csit-1node-config-performance-only-{stream}, + openflowplugin-csit-1node-config-performance-lithium-redesign-only-{stream}, + ovsdb-csit-1node-netvirt-only-{stream}, + ovsdb-csit-1node-netvirt-all-{stream}, + ovsdb-csit-1node-southbound-only-{stream}, + ovsdb-csit-1node-southbound-all-{stream}, + snmp-csit-1node-basic-only-{stream}, + snmp-csit-1node-basic-all-{stream}, + topoprocessing-csit-1node-topology-operations-all-{stream}, + topoprocessing-csit-1node-topology-operations-only-{stream}, + tsdr-csit-1node-h2-datastore-only-{stream}, + tsdr-csit-1node-h2-datastore-all-{stream}, + tsdr-csit-1node-hbase-datastore-only-{stream}, + tsdr-csit-1node-hbase-datastore-all-{stream}, + usc-csit-1node-channel-only-{stream}, + usc-csit-1node-channel-all-{stream}, + vpnservice-csit-1node-vpnservice-only-{stream}, + vpnservice-csit-1node-vpnservice-all-{stream} + - stable-lithium: branch: 'stable/lithium' csit-list: > diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index bc1882fe0..73253f7cb 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/iotdm/iotdm.cfg b/jjb/iotdm/iotdm.cfg index 467677d51..52a0e7b26 100644 --- a/jjb/iotdm/iotdm.cfg +++ b/jjb/iotdm/iotdm.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 8524b7a26..640d0bc39 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index 4ad7fd8d0..b951c8762 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 89021117e..56be3d358 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/l2switch/l2switch.cfg b/jjb/l2switch/l2switch.cfg index 469b8c174..23a505286 100644 --- a/jjb/l2switch/l2switch.cfg +++ b/jjb/l2switch/l2switch.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index e4459d617..e8f3fe526 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/lacp/lacp.cfg b/jjb/lacp/lacp.cfg index a8ad7be49..36a241fdf 100644 --- a/jjb/lacp/lacp.cfg +++ b/jjb/lacp/lacp.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 985c1e230..c0ef799b3 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index 9806abb85..d6a5e614d 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/lispflowmapping/lispflowmapping.cfg b/jjb/lispflowmapping/lispflowmapping.cfg index 3ad0f2be4..a5ad2b6c7 100644 --- a/jjb/lispflowmapping/lispflowmapping.cfg +++ b/jjb/lispflowmapping/lispflowmapping.cfg @@ -1,12 +1,13 @@ MVN_GOALS: clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml index d13c18441..eb5a58aff 100644 --- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml +++ b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/mdsal/mdsal.cfg b/jjb/mdsal/mdsal.cfg index 4ff8636d2..08dad7035 100644 --- a/jjb/mdsal/mdsal.cfg +++ b/jjb/mdsal/mdsal.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m DEPENDENCIES: odlparent,yangtools diff --git a/jjb/messaging4transport/messaging4transport.cfg b/jjb/messaging4transport/messaging4transport.cfg index e0cb5077c..1f7a0d7ff 100644 --- a/jjb/messaging4transport/messaging4transport.cfg +++ b/jjb/messaging4transport/messaging4transport.cfg @@ -1,9 +1,10 @@ DEPENDENCIES: yangtools,aaa,controller,odlparent STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index 5e759d013..5540d97de 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/nemo/nemo.cfg b/jjb/nemo/nemo.cfg index 90638fa47..9eb7e0148 100644 --- a/jjb/nemo/nemo.cfg +++ b/jjb/nemo/nemo.cfg @@ -1,9 +1,10 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true DEPENDENCIES: controller,yangtools,odlparent diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 4b3b45474..314a2e150 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 580649485..33c265025 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/netconf/netconf.cfg b/jjb/netconf/netconf.cfg index fc49545de..1f20441c1 100644 --- a/jjb/netconf/netconf.cfg +++ b/jjb/netconf/netconf.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true DEPENDENCIES: aaa,controller,odlparent,yangtools diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index 23f3202ac..a461eacc5 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/netide/netide.cfg b/jjb/netide/netide.cfg index 0e09d32d4..7dfad3740 100644 --- a/jjb/netide/netide.cfg +++ b/jjb/netide/netide.cfg @@ -1,10 +1,11 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m DEPENDENCIES: odlparent,yangtools,controller,openflowjava diff --git a/jjb/neutron/neutron.cfg b/jjb/neutron/neutron.cfg index aaaa3978c..c905a57ab 100644 --- a/jjb/neutron/neutron.cfg +++ b/jjb/neutron/neutron.cfg @@ -1,12 +1,13 @@ DEPENDENCIES: odlparent,aaa STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/next/next.cfg b/jjb/next/next.cfg index beeb4c154..0708008fe 100644 --- a/jjb/next/next.cfg +++ b/jjb/next/next.cfg @@ -1,9 +1,10 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true DEPENDENCIES: odlparent,controller,yangtools diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index 1d7b48290..0baf9a4dc 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/nic/nic.cfg b/jjb/nic/nic.cfg index f5a103313..f6cb7b747 100644 --- a/jjb/nic/nic.cfg +++ b/jjb/nic/nic.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg index b7e79a5d1..98da554a4 100644 --- a/jjb/odlparent/odlparent.cfg +++ b/jjb/odlparent/odlparent.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/of-config/of-config.cfg b/jjb/of-config/of-config.cfg index 7b2c9d815..fd1718809 100644 --- a/jjb/of-config/of-config.cfg +++ b/jjb/of-config/of-config.cfg @@ -1,9 +1,10 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true DEPENDENCIES: controller,yangtools,odlparent,netconf diff --git a/jjb/ofextensions/circuitsw/circuitsw.cfg b/jjb/ofextensions/circuitsw/circuitsw.cfg index f27b77311..ab4492c79 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.cfg +++ b/jjb/ofextensions/circuitsw/circuitsw.cfg @@ -1,8 +1,8 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 DEPENDENCIES: yangtools,controller,openflowplugin diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg index 8f75acb62..8f5dc6c3d 100644 --- a/jjb/openflowjava/openflowjava.cfg +++ b/jjb/openflowjava/openflowjava.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml index 13d5a3cfa..5fae0edd8 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml index 2657a1815..e76dacc4c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml index c92b1b9c6..8b21e0a7f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml index 7fef892cc..ef8109471 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml index bcb74b6af..7afd5d186 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 9fc5de8da..ba0203658 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml index 9f66d8898..d4c8f204e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml index 8abbef49c..8ee3b185a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml index 4710056b5..9d9002584 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml index 5e090b828..4bd1b7f64 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml index 9426fa97b..5e251b1c0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml index 46f67982a..299e599b3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml index e0961c524..beef22f79 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 1381fd680..f2ce6f9d5 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml index e142f59f5..73f609130 100644 --- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml index b04c08ff0..f86eca21e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml index 183bff711..534af2ac7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml index 1acc99a01..fedd2c30e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml index 221ea7be3..e14a6f731 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml index 419c0acc0..e98cfbc34 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml index aa2e1d3a8..9598ce0b1 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml index 4a81401a8..eee00221e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml index 67a9645b6..4ca8ded16 100644 --- a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml index db3de0987..ad95d3698 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml index d4fcb3da9..d7aa3a9c7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg index cde1e4ce5..a293df913 100644 --- a/jjb/openflowplugin/openflowplugin.cfg +++ b/jjb/openflowplugin/openflowplugin.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index 186d91e3a..ee676cf3d 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -9,11 +9,16 @@ # stream: release stream (eg. stable-lithium or beryllium) # branch: git branch (eg. stable/lithium or master) stream: - - beryllium: + - boron: branch: 'master' jdk: openjdk7 jdks: - openjdk7 + - beryllium: + branch: 'stable/beryllium' + jdk: openjdk7 + jdks: + - openjdk7 project: 'opflex' diff --git a/jjb/opflex/opflex-dependencies-rpm.yaml b/jjb/opflex/opflex-dependencies-rpm.yaml index 8f4291d25..fa2782363 100644 --- a/jjb/opflex/opflex-dependencies-rpm.yaml +++ b/jjb/opflex/opflex-dependencies-rpm.yaml @@ -5,11 +5,16 @@ - 'opflex-openvswitch_rpm-{stream}' stream: - - beryllium: + - boron: branch: 'master' jdk: openjdk7 jdks: - openjdk7 + - beryllium: + branch: 'stable/beryllium' + jdk: openjdk7 + jdks: + - openjdk7 project: 'opflex' diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml index d4a1d55e6..666de5658 100644 --- a/jjb/opflex/opflex-dependencies.yaml +++ b/jjb/opflex/opflex-dependencies.yaml @@ -6,11 +6,16 @@ - 'opflex-openvswitch_tgz-{stream}' stream: - - beryllium: + - boron: branch: 'master' jdk: openjdk7 jdks: - openjdk7 + - beryllium: + branch: 'stable/beryllium' + jdk: openjdk7 + jdks: + - openjdk7 project: 'opflex' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 37efaa775..4b941192c 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/ovsdb/ovsdb-csit-netvirt.yaml b/jjb/ovsdb/ovsdb-csit-netvirt.yaml index 2763d37b4..811c551f0 100644 --- a/jjb/ovsdb/ovsdb-csit-netvirt.yaml +++ b/jjb/ovsdb/ovsdb-csit-netvirt.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml index a87998156..ea17f351b 100644 --- a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml +++ b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - master: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 52cf7ace3..aea82e45d 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 8f5565b09..d6fb1ad27 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -6,11 +6,16 @@ # stream: release stream (eg. stable-lithium or beryllium) # branch: git branch (eg. stable/lithium or master) stream: - - beryllium: + - boron: branch: 'master' jdk: openjdk8 jdks: - openjdk8 + - beryllium: + branch: 'stable/beryllium' + jdk: openjdk8 + jdks: + - openjdk8 - stable-lithium: branch: 'stable/lithium' jdk: openjdk7 diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg index ba0414062..f179066c2 100644 --- a/jjb/ovsdb/ovsdb.cfg +++ b/jjb/ovsdb/ovsdb.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 43dbf815e..323078396 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/packetcable/packetcable.cfg b/jjb/packetcable/packetcable.cfg index 633f6d544..e7160d9a0 100644 --- a/jjb/packetcable/packetcable.cfg +++ b/jjb/packetcable/packetcable.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/persistence/persistence.cfg b/jjb/persistence/persistence.cfg index 3e7915f7f..80c15af11 100644 --- a/jjb/persistence/persistence.cfg +++ b/jjb/persistence/persistence.cfg @@ -1,7 +1,10 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 +- beryllium: + branch: stable/beryllium + jdks: openjdk7,openjdk8 - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/reservation/reservation.cfg b/jjb/reservation/reservation.cfg index b8ef2c800..c8c584494 100644 --- a/jjb/reservation/reservation.cfg +++ b/jjb/reservation/reservation.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index 3a385c2f2..d29af4fa4 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.cfg b/jjb/sdninterfaceapp/sdninterfaceapp.cfg index 6142ff99c..75f57e970 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.cfg +++ b/jjb/sdninterfaceapp/sdninterfaceapp.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/sfc/sfc-csit-clustering.yaml b/jjb/sfc/sfc-csit-clustering.yaml index 363210e18..36514ba60 100644 --- a/jjb/sfc/sfc-csit-clustering.yaml +++ b/jjb/sfc/sfc-csit-clustering.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 8839563fb..88ac908f8 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -6,8 +6,10 @@ # stream: release stream (eg. stable-lithium or beryllium) # branch: git branch (eg. stable/lithium or master) stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' project: 'sfc' jdk: 'openjdk7' diff --git a/jjb/sfc/sfc.cfg b/jjb/sfc/sfc.cfg index 1a95bafaf..a1a4f93cb 100644 --- a/jjb/sfc/sfc.cfg +++ b/jjb/sfc/sfc.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/snbi/snbi.cfg b/jjb/snbi/snbi.cfg index b7e79a5d1..98da554a4 100644 --- a/jjb/snbi/snbi.cfg +++ b/jjb/snbi/snbi.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml index 1bc7c2448..41eb2f79f 100644 --- a/jjb/snmp/snmp-csit-basic.yaml +++ b/jjb/snmp/snmp-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/snmp/snmp.cfg b/jjb/snmp/snmp.cfg index 4d4eb61a8..f7c344016 100644 --- a/jjb/snmp/snmp.cfg +++ b/jjb/snmp/snmp.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/snmp4sdn/snmp4sdn.cfg b/jjb/snmp4sdn/snmp4sdn.cfg index 0521834bc..8ef69213a 100644 --- a/jjb/snmp4sdn/snmp4sdn.cfg +++ b/jjb/snmp4sdn/snmp4sdn.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/spectrometer/spectrometer-python.yaml b/jjb/spectrometer/spectrometer-python.yaml index 179c08168..f4ce5b8c1 100644 --- a/jjb/spectrometer/spectrometer-python.yaml +++ b/jjb/spectrometer/spectrometer-python.yaml @@ -4,7 +4,7 @@ - 'spectrometer-verify-python-{stream}' stream: - - beryllium: + - master: branch: 'master' project: 'spectrometer' diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index debe10e49..01db60f5b 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 4857af774..b84c79784 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -11,8 +11,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/sxp/sxp.cfg b/jjb/sxp/sxp.cfg index 1d41cea5b..891229cd0 100644 --- a/jjb/sxp/sxp.cfg +++ b/jjb/sxp/sxp.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/tcpmd5/tcpmd5.cfg b/jjb/tcpmd5/tcpmd5.cfg index b962bcda3..64e8794ae 100644 --- a/jjb/tcpmd5/tcpmd5.cfg +++ b/jjb/tcpmd5/tcpmd5.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/toolkit/toolkit.cfg b/jjb/toolkit/toolkit.cfg index 7510cf225..709de265c 100644 --- a/jjb/toolkit/toolkit.cfg +++ b/jjb/toolkit/toolkit.cfg @@ -1,5 +1,8 @@ DEPENDENCIES: odlparent,controller STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7 +- beryllium: + branch: stable/beryllium + jdks: openjdk7 diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index 0713090ef..92b68fffa 100644 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/topoprocessing/topoprocessing.cfg b/jjb/topoprocessing/topoprocessing.cfg index b52890e6c..241ffc23d 100644 --- a/jjb/topoprocessing/topoprocessing.cfg +++ b/jjb/topoprocessing/topoprocessing.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 diff --git a/jjb/tsdr/tsdr-csit-h2.yaml b/jjb/tsdr/tsdr-csit-h2.yaml index 30f8d7c2a..2efed7aea 100644 --- a/jjb/tsdr/tsdr-csit-h2.yaml +++ b/jjb/tsdr/tsdr-csit-h2.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index bb096260c..f632eb01d 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/tsdr/tsdr.cfg b/jjb/tsdr/tsdr.cfg index f43f8264c..2bad21e5c 100644 --- a/jjb/tsdr/tsdr.cfg +++ b/jjb/tsdr/tsdr.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/ttp/ttp.cfg b/jjb/ttp/ttp.cfg index b7e79a5d1..98da554a4 100644 --- a/jjb/ttp/ttp.cfg +++ b/jjb/ttp/ttp.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml index 28790532d..10e2c19a2 100644 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ b/jjb/unimgr/unimgr-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/unimgr/unimgr.cfg b/jjb/unimgr/unimgr.cfg index 70b07512d..075716814 100644 --- a/jjb/unimgr/unimgr.cfg +++ b/jjb/unimgr/unimgr.cfg @@ -1,9 +1,10 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true DEPENDENCIES: odlparent,yangtools,controller,ovsdb diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 2d8976239..20d50101b 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/usc/usc.cfg b/jjb/usc/usc.cfg index c9f11b823..be2e5973a 100644 --- a/jjb/usc/usc.cfg +++ b/jjb/usc/usc.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk8,openjdk7 diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index 1b7da3862..a16717a2b 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/usecplugin/usecplugin.cfg b/jjb/usecplugin/usecplugin.cfg index ef4b316a2..f388e2c71 100644 --- a/jjb/usecplugin/usecplugin.cfg +++ b/jjb/usecplugin/usecplugin.cfg @@ -1,9 +1,10 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true DEPENDENCIES: openflowplugin,odlparent,controller,yangtools diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml index 6765767ac..8f80816ef 100644 --- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml +++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/vpnservice/vpnservice.cfg b/jjb/vpnservice/vpnservice.cfg index 675f64504..a8f6295a3 100644 --- a/jjb/vpnservice/vpnservice.cfg +++ b/jjb/vpnservice/vpnservice.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index 88d615347..3c19e4e1d 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -12,8 +12,10 @@ # Project branches stream: -# - beryllium: +# - boron: # branch: 'master' +# - beryllium: +# branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index bfd199bd8..c9a5716ef 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -12,8 +12,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' install: - only: diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg index e94fb565b..843bfa6b6 100644 --- a/jjb/vtn/vtn.cfg +++ b/jjb/vtn/vtn.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/yang-push/yang-push.cfg b/jjb/yang-push/yang-push.cfg index 90638fa47..9eb7e0148 100644 --- a/jjb/yang-push/yang-push.cfg +++ b/jjb/yang-push/yang-push.cfg @@ -1,9 +1,10 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true DEPENDENCIES: controller,yangtools,odlparent diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml index 4dab955d0..a0c7ed464 100644 --- a/jjb/yangtools/yangtools-verify.yaml +++ b/jjb/yangtools/yangtools-verify.yaml @@ -17,10 +17,10 @@ mvnver: '{mvn33}' stream: - - pre-boron: - branch: pre-boron - - beryllium: + - boron: branch: master + - beryllium: + branch: stable/beryllium project: 'yangtools' diff --git a/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg index 49fff120f..d13c48fb2 100644 --- a/jjb/yangtools/yangtools.cfg +++ b/jjb/yangtools/yangtools.cfg @@ -1,11 +1,12 @@ STREAMS: -- beryllium: +- boron: branch: master jdks: openjdk7,openjdk8 autorelease: true -- pre-boron: - branch: pre-boron +- beryllium: + branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7,openjdk8 -- 2.36.6