From 7ea27cc20a9f252f4196db2ce52da4ef7c3b73cb Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Mon, 15 Jan 2018 16:15:38 -0500 Subject: [PATCH] Switch all projects to use new maven-merge job Pull in Maven patch deploy the maven-merge jobs to all projects. Also pulls in patch to add '-e' to Maven calls to print full stack trace. Change-Id: I96750a05f845485ddb7807e18a54e907b00ee9fe Signed-off-by: Thanh Ha --- jjb/aaa/aaa.yaml | 3 --- jjb/alto/alto.yaml | 3 --- jjb/atrium/atrium.yaml | 3 --- jjb/bgpcep/bgpcep.yaml | 3 --- jjb/bier/bier.yaml | 3 --- jjb/capwap/capwap.yaml | 3 --- jjb/cardinal/cardinal.yaml | 3 --- jjb/centinel/centinel.yaml | 3 --- jjb/coe/coe.yaml | 3 --- jjb/controller/controller.yaml | 3 --- jjb/coretutorials/coretutorials.yaml | 3 --- jjb/daexim/daexim.yaml | 2 -- jjb/didm/didm.yaml | 3 --- jjb/dlux/dlux.yaml | 3 --- jjb/dluxapps/dluxapps.yaml | 3 --- jjb/eman/eman.yaml | 3 --- jjb/faas/faas.yaml | 3 --- jjb/federation/federation.yaml | 3 --- jjb/genius/genius.yaml | 3 --- jjb/global-jjb | 2 +- jjb/groupbasedpolicy/groupbasedpolicy.yaml | 3 --- jjb/honeycomb/vbd/vbd.yaml | 3 --- jjb/infrautils/infrautils.yaml | 3 --- jjb/iotdm/iotdm.yaml | 3 --- jjb/jsonrpc/jsonrpc.yaml | 4 ---- jjb/l2switch/l2switch.yaml | 3 --- jjb/lacp/lacp.yaml | 3 --- jjb/lispflowmapping/lispflowmapping.yaml | 3 --- jjb/mdsal/mdsal.yaml | 3 --- jjb/messaging4transport/messaging4transport.yaml | 3 --- jjb/natapp/natapp.yaml | 3 --- jjb/nemo/nemo.yaml | 3 --- jjb/netconf/netconf.yaml | 3 --- jjb/netide/netide.yaml | 3 --- jjb/netvirt/netvirt.yaml | 1 - jjb/neutron/neutron.yaml | 3 --- jjb/next/next.yaml | 3 --- jjb/nic/nic.yaml | 3 --- jjb/ocpplugin/ocpplugin.yaml | 3 --- jjb/odlparent/odlparent.yaml | 3 --- jjb/of-config/of-config.yaml | 3 --- jjb/ofextensions/circuitsw/circuitsw.yaml | 3 --- jjb/openflowjava/openflowjava.yaml | 2 -- jjb/openflowplugin/openflowplugin.yaml | 3 --- jjb/ovil/ovil.yaml | 1 - jjb/ovsdb/ovsdb.yaml | 3 --- jjb/p4plugin/p4plugin.yaml | 1 - jjb/packetcable/packetcable.yaml | 3 --- jjb/persistence/persistence.yaml | 3 --- jjb/reservation/reservation.yaml | 3 --- jjb/sdninterfaceapp/sdninterfaceapp.yaml | 3 --- jjb/sfc/sfc.yaml | 3 --- jjb/snbi/snbi.yaml | 3 --- jjb/snmp/snmp.yaml | 3 --- jjb/snmp4sdn/snmp4sdn.yaml | 3 --- jjb/sxp/sxp.yaml | 3 --- jjb/systemmetrics/systemmetrics.yaml | 3 --- jjb/topoprocessing/topoprocessing.yaml | 3 --- jjb/transportpce/transportpce.yaml | 3 --- jjb/tsdr/tsdr.yaml | 3 --- jjb/ttp/ttp.yaml | 3 --- jjb/unimgr/unimgr.yaml | 3 --- jjb/usc/usc.yaml | 3 --- jjb/usecplugin/usecplugin.yaml | 3 --- jjb/vtn/vtn.yaml | 3 --- jjb/yang-push/yang-push.yaml | 3 --- jjb/yangide/yangide.yaml | 3 --- jjb/yangtools/yangtools.yaml | 3 --- 68 files changed, 1 insertion(+), 195 deletions(-) diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 08cfbdfbb..72a41e37f 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - gerrit-maven-merge stream: oxygen project: 'aaa' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - gerrit-maven-merge stream: nitrogen project: 'aaa' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - gerrit-maven-merge stream: carbon project: 'aaa' diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 13c60f745..a85a816a2 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'alto' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'alto' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'alto' diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index aa3c6139d..d6cb887f6 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'atrium' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'atrium' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'atrium' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index dee6946c0..6787f0d31 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-merge stream: oxygen project: 'bgpcep' @@ -41,7 +40,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-merge stream: nitrogen project: 'bgpcep' @@ -76,7 +74,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-merge stream: carbon project: 'bgpcep' diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 4b9c3b86f..42d3c5c56 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'bier' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'bier' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'bier' diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index 9c87714fb..7549ec42e 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'capwap' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'capwap' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'capwap' diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 3880e23be..7b4460c01 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'cardinal' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'cardinal' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'cardinal' diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index 14b9db0e9..757601598 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'centinel' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'centinel' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'centinel' diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index c83c050c3..0d49e9b7f 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'coe' project-name: 'coe' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'coe' project-name: 'coe' @@ -58,7 +56,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'coe' project-name: 'coe' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index dc7bc56e3..327799ab2 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-merge stream: oxygen project: 'controller' @@ -34,7 +33,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - gerrit-maven-merge stream: nitrogen project: 'controller' @@ -61,7 +59,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - gerrit-maven-merge stream: carbon project: 'controller' diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index 5a300fe31..1ab764684 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -4,7 +4,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'coretutorials' @@ -30,7 +29,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'coretutorials' @@ -56,7 +54,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'coretutorials' diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 2bd15c025..5c13c798b 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'daexim' project-name: 'daexim' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'daexim' project-name: 'daexim' diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index 88a2f40c9..c2249a289 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'didm' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'didm' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'didm' diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index a6f6104f4..76a63f8d7 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - gerrit-maven-merge stream: oxygen project: 'dlux' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - gerrit-maven-merge stream: nitrogen project: 'dlux' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - gerrit-maven-merge stream: carbon project: 'dlux' diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 486b12b1d..88c1c4b2a 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'dluxapps' project-name: 'dluxapps' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'dluxapps' project-name: 'dluxapps' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'dluxapps' project-name: 'dluxapps' diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index 859189364..f889912ee 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'eman' @@ -35,7 +34,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'eman' @@ -64,7 +62,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'eman' diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index 73a5ef469..e1bfa4d31 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'faas' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'faas' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'faas' diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index 50ce1bdf8..3482598c5 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' project: 'federation' project-name: 'federation' @@ -34,7 +33,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' project: 'federation' project-name: 'federation' @@ -62,7 +60,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' project: 'federation' project-name: 'federation' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index ab752c210..5e21d81bb 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'genius' @@ -39,7 +38,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'genius' @@ -71,7 +69,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'genius' diff --git a/jjb/global-jjb b/jjb/global-jjb index 5e403dec0..c00e75c79 160000 --- a/jjb/global-jjb +++ b/jjb/global-jjb @@ -1 +1 @@ -Subproject commit 5e403dec080850163f75cf80e0317fcf839d69aa +Subproject commit c00e75c79a275db041585fe532ab0a36169c3c38 diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index e3b1443dd..bf28b0175 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'groupbasedpolicy' @@ -38,7 +37,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'groupbasedpolicy' @@ -70,7 +68,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'groupbasedpolicy' diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index 43e0f2def..d6459caa0 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'honeycomb/vbd' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'honeycomb/vbd' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'honeycomb/vbd' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 6c743bc37..5b26154e4 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'infrautils' @@ -33,7 +32,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'infrautils' @@ -60,7 +58,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'infrautils' diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 088ec8757..3138be836 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'iotdm' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'iotdm' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'iotdm' diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 387b10b4a..8be6bef23 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -4,7 +4,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'jsonrpc' project-name: 'jsonrpc' @@ -30,7 +29,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'jsonrpc' project-name: 'jsonrpc' @@ -56,7 +54,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'jsonrpc' project-name: 'jsonrpc' @@ -82,7 +79,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'jsonrpc' project-name: 'jsonrpc' diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 0b6745a59..24535bbee 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'l2switch' @@ -37,7 +36,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'l2switch' @@ -69,7 +67,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'l2switch' diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index bb7895954..432afc945 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'lacp' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'lacp' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'lacp' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index bb8b08af0..0cfe21a30 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'lispflowmapping' @@ -38,7 +37,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'lispflowmapping' @@ -70,7 +68,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'lispflowmapping' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 4df31f8b7..b45f6641b 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-merge stream: oxygen project: 'mdsal' @@ -35,7 +34,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-merge stream: nitrogen project: 'mdsal' @@ -63,7 +61,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-merge stream: carbon project: 'mdsal' diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index c758d82ec..60c15f857 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'messaging4transport' @@ -34,7 +33,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'messaging4transport' @@ -62,7 +60,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'messaging4transport' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 956eea3d5..166100f5d 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'natapp' @@ -34,7 +33,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'natapp' @@ -62,7 +60,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'natapp' diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 0874bb36d..8a9c37ae7 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'nemo' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'nemo' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'nemo' diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index e557f8237..575d9c025 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'netconf' @@ -33,7 +32,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'netconf' @@ -60,7 +58,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'netconf' diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 372efdf93..1ee7e512d 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'netide' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'netide' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'netide' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 84360509e..061d222d8 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' - gerrit-tox-verify stream: diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 53aa3ef72..b07936607 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'neutron' @@ -35,7 +34,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'neutron' @@ -64,7 +62,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'neutron' diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index f41693c9f..4f413844a 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'next' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'next' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'next' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 593f72cb9..12cd1473b 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'nic' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'nic' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'nic' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 56e4e2969..ae0c75ad2 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'ocpplugin' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'ocpplugin' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'ocpplugin' diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 840280f64..a1e295cfc 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -4,7 +4,6 @@ jobs: - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-merge - gerrit-tox-verify project: odlparent @@ -41,7 +40,6 @@ jobs: - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-merge - gerrit-tox-verify project: odlparent @@ -81,7 +79,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-merge - gerrit-tox-verify stream: carbon diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index cce3332fc..ab6c67a89 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'of-config' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'of-config' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'of-config' diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 68b6c8c1a..1f892da28 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -4,7 +4,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'ofextensions/circuitsw' @@ -30,7 +29,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'ofextensions/circuitsw' @@ -56,7 +54,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'ofextensions/circuitsw' diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index 771653776..5d7df78f3 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'openflowjava' @@ -34,7 +33,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'openflowjava' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 166a55f31..e82bc6b66 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'openflowplugin' @@ -39,7 +38,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'openflowplugin' @@ -71,7 +69,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'openflowplugin' diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml index 57b3457a5..ba3a55032 100644 --- a/jjb/ovil/ovil.yaml +++ b/jjb/ovil/ovil.yaml @@ -2,7 +2,6 @@ - project: name: ovil jobs: - - '{project-name}-merge-{stream}' - '{project-name}-maven-jobs' - gerrit-tox-verify diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 79c14e350..476b606f2 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'ovsdb' @@ -34,7 +33,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'ovsdb' @@ -62,7 +60,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'ovsdb' diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index e7e89ea6a..1b77e5f93 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'p4plugin' diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 9022c073a..cbea081f8 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'packetcable' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'packetcable' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'packetcable' diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index 55411c36c..0c0db87cf 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -4,7 +4,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'persistence' @@ -32,7 +31,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'persistence' @@ -60,7 +58,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'persistence' diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 2269a92f0..c551d402b 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -4,7 +4,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'reservation' @@ -30,7 +29,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'reservation' @@ -56,7 +54,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'reservation' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 72cada299..704e1c789 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'sdninterfaceapp' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'sdninterfaceapp' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'sdninterfaceapp' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index b3d954bb5..3da3c1efa 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'sfc' @@ -34,7 +33,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'sfc' @@ -62,7 +60,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'sfc' diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 2096cfc70..1b17aa4b3 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'snbi' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'snbi' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'snbi' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index a9830adea..6cc6f8a1c 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'snmp' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'snmp' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'snmp' diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index aa880ef3f..f435a1c6f 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'snmp4sdn' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'snmp4sdn' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'snmp4sdn' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 15da7544c..c7df74017 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'sxp' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'sxp' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'sxp' diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index 1605e66b1..b38ae2e4d 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -4,7 +4,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'systemmetrics' project-name: 'systemmetrics' @@ -30,7 +29,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'systemmetrics' project-name: 'systemmetrics' @@ -56,7 +54,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'systemmetrics' project-name: 'systemmetrics' diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 5657e668a..47974a495 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'topoprocessing' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'topoprocessing' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'topoprocessing' diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index e45a86406..bddccb90f 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -4,7 +4,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'transportpce' project-name: 'transportpce' @@ -30,7 +29,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'transportpce' project-name: 'transportpce' @@ -56,7 +54,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' project: 'transportpce' project-name: 'transportpce' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 24b551014..a0594e289 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'tsdr' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'tsdr' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'tsdr' diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index c555ea814..3375a869b 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'ttp' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'ttp' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'ttp' diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 2e0441ed0..8613b63ac 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'unimgr' @@ -33,7 +32,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'unimgr' @@ -61,7 +59,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'unimgr' diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 1a66df1d7..7ab9c71b6 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'usc' @@ -34,7 +33,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'usc' @@ -62,7 +60,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'usc' diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index b93930ad3..43c14a22d 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'usecplugin' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'usecplugin' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'usecplugin' diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index 3544b58d2..69abc18b2 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -6,7 +6,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'vtn' @@ -38,7 +37,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'vtn' @@ -70,7 +68,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'vtn' diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index 0c54b14c4..952f813c4 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -5,7 +5,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'yang-push' @@ -32,7 +31,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'yang-push' @@ -59,7 +57,6 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'yang-push' diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index cdcdb8427..fbc83d824 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -4,7 +4,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: oxygen project: 'yangide' @@ -30,7 +29,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'yangide' @@ -56,7 +54,6 @@ jobs: - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'yangide' diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 9173f14e6..910746e5e 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -4,7 +4,6 @@ jobs: - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' project: yangtools project-name: yangtools @@ -41,7 +40,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: nitrogen project: 'yangtools' @@ -78,7 +76,6 @@ - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - '{project-name}-merge-{stream}' stream: carbon project: 'yangtools' -- 2.36.6