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 <thanh.ha@linuxfoundation.org>

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 08cfbdfbbe3d92b388621ff2e2fa9a1b11fd2f68..72a41e37f818401d7c202b9c73b9e2a86ca5e543 100644 (file)
--- 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 13c60f745c51aa4cb6b3f63f3068c81bbb3b32de..a85a816a2733c28a139b0f70177ef6fb510aeace 100644 (file)
--- 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 aa3c6139d6ec1e6ff4733e3566014c08a87d180d..d6cb887f65c49ae78d676958a4b65ab34755b249 100644 (file)
--- 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 dee6946c09dbdeed36587dffbdc595f9faa7f4a8..6787f0d31dadddd24b560eb8dc72467a10c5f63e 100644 (file)
--- 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 4b9c3b86fcc1d51a59cd7be00655a519348554b6..42d3c5c5626e798b06631fbfe22d3e8a23b3e8dc 100644 (file)
--- 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 9c87714fb8fbf8d59302f172a1b1a913fccd8954..7549ec42ece9da893f8d0c8f54ea1fd155af6e18 100644 (file)
--- 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 3880e23be198d844ec3cf8231b4e34bb7a61c762..7b4460c0154c3c098ea85556c50f3b17f79a9d64 100644 (file)
--- 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 14b9db0e9f1f1e403c1f8169d829f68a06117da2..75760159823740c25c85945b2484860c2a19587a 100644 (file)
--- 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 c83c050c38c414a417cc3e4411f4b70afdbba687..0d49e9b7f378a80fd2384fe4449b7ab46bb6148e 100644 (file)
--- 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 dc7bc56e31bcc1e8a8f36496c7f40934b1a5e7b3..327799ab2137ce68c02ab6a23ac2a7509a5fc2e8 100644 (file)
--- 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 5a300fe311f5dabcab5c4f197f72b86d3933edaf..1ab764684150244183edf9d42c76829563a7f104 100644 (file)
--- 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 2bd15c025b8434fb026c0148556c6587efcadd5c..5c13c798bcae7337ce1d402384bff315871ec71f 100644 (file)
--- 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 88a2f40c905037aad993ce43946bb46db27c34c2..c2249a2894651b1f2a5c7e585c84a378982a765b 100644 (file)
--- 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 a6f6104f4c5aae5f987ab3bb45ee79fa1ee3c0d4..76a63f8d7434f0079e57d07a4d29d5dcc70b647f 100644 (file)
--- 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 486b12b1d40e658c005665e96b47a6e3fe3a2e98..88c1c4b2abf004610b05986858f01297efee9263 100644 (file)
--- 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 8591893647898ead50816ed85d1f89232224447b..f889912ee04b09af05ed6dfb6d5ce5f5a10e3346 100644 (file)
--- 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 73a5ef4693acc310dbf6607c601bd736b47cc985..e1bfa4d312db1f75a1b802655522be35578de88a 100644 (file)
--- 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 50ce1bdf8c6d1170978dc2ee2614cb9be5678abe..3482598c52021ac08d9985bbc20a5891472e0e2c 100644 (file)
--- 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 ab752c2108b9f3af678b19c45fcb0950280203c3..5e21d81bb2e0a83a018c203c81809744f3282619 100644 (file)
--- 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 5e403dec080850163f75cf80e0317fcf839d69aa..c00e75c79a275db041585fe532ab0a36169c3c38 160000 (submodule)
--- 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 e3b1443dd5418da69f189c8de19534d5b533fe33..bf28b0175e40a848bab9941bcd477a567e416dd5 100644 (file)
--- 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 43e0f2deffdc310c42b40917c99e4478e463e93c..d6459caa00af6a0053e524702a4fdce06e303f1d 100644 (file)
--- 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 6c743bc372bf2059ca6ad66fa5f78ee3717dfe53..5b26154e4f9fb213dcb090fc03d39abc9c24ca72 100644 (file)
--- 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 088ec87578099b7a1f78cd87fa4c7bb4f59e97ee..3138be8365f0a4008826d608dd7522f30bae757f 100644 (file)
--- 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 387b10b4a35b3645cfa75937a99ca65552cb4f90..8be6bef2321ba6d0fd40f8fb402375cd7a37d334 100644 (file)
--- 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 0b6745a59e4d197760367da0358525736359517d..24535bbee3949055957bb7a0d95874bdd1e65bc2 100644 (file)
--- 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 bb78959543172bc573bcabc6abd98aac0dc40494..432afc945844daa8b2d8034d42e6c331b6516cad 100644 (file)
--- 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 bb8b08af01924ed54eece1ff8ec46b8afbd68567..0cfe21a30497e942fc27eefbd09c52fb45d5604f 100644 (file)
--- 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 4df31f8b7a79d31255de9d1bbb42687b63fbb96f..b45f6641b4440d00b23814081d6c0eac7ecabae8 100644 (file)
--- 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 c758d82ecad8ea312e815984c85c0510e65b143d..60c15f857ece337e00744a2b497bf1b4e32baefc 100644 (file)
--- 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 956eea3d5d13bccee8ed78e0d7942f8743ae8e98..166100f5df8ff0b5d359940b2148ccd8012e3cfc 100644 (file)
--- 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 0874bb36dd651fbb0996ac4f01dca4d396cc8a10..8a9c37ae770713d55c07256cee8dc245961898b7 100644 (file)
--- 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 e557f823789b5df9527c1db7f42bd539b7fa1168..575d9c0252915dc72f161c651e35e29a8f800600 100644 (file)
--- 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 372efdf93a53b3873e20a8a5232566f6dcca2ae6..1ee7e512d4410572fe7c8f0ff47038316d93a5aa 100644 (file)
--- 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 84360509eed02d36cb9a5b54a5be05a060db2782..061d222d80ebec45494f792412f8c56fa4ad67cc 100644 (file)
--- 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 53aa3ef72da233143c98eb7c1059a9a91a657590..b079366079c65892433693659fca38c69f474e25 100644 (file)
--- 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 f41693c9f171f8b5a66133e2f8528c0f6c17d52c..4f413844ae66515868dbc778c1b438a0c8ba0fd9 100644 (file)
--- 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 593f72cb917b4d51ce1a7754516c6fe4030d9322..12cd1473be53d44ee4e605453de32efeffb3b6e4 100644 (file)
--- 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 56e4e296999c4469c846959239c39c5555e21b41..ae0c75ad2a5148bb957f871c461da371ea88df23 100644 (file)
--- 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 840280f6477ddaf8d8b8b02275dd74a8957a54f1..a1e295cfce930f66d56f30c891ba913a907edecc 100644 (file)
--- 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 cce3332fc99ffb78a3ec48dbd5946545df4c2d4a..ab6c67a89b40ab759e512f3bc5cbd19e5bc0ad88 100644 (file)
--- 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 68b6c8c1aba36c37f02cea055bed449addb33194..1f892da2846febce78094d72240097ae54230da6 100644 (file)
--- 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 77165377681e2d20d0004db4946a826fd37528e6..5d7df78f32c85c2b2a72a1f12366e428c3220aea 100644 (file)
--- 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 166a55f31c90d61758d7b46ae62f993b6cd5b916..e82bc6b662bcee7c040df2d6c36f174e71fac9df 100644 (file)
--- 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 57b3457a5a7ff56478188de70fa2ee75f4a0d047..ba3a55032da8a2cded3c19edb282c9e97c0bc7dd 100644 (file)
--- 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 79c14e3504ec321644e25a14cac8bfc57b6cd2fe..476b606f29249fe8c01ac25fb04e3e6a5a48e31c 100644 (file)
--- 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 e7e89ea6a75dfc307bbe7058893a031525be0604..1b77e5f939f8113323069bf4ed1e1e1bc0bd4d53 100644 (file)
--- 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 9022c073abbf6ff1bfbc8cc8c15da2c5591c7ec4..cbea081f881d4babcef6b342c493739e28795a95 100644 (file)
--- 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 55411c36c67be86b1a264f9fe7315b144ce983db..0c0db87cfd5979b7c4deda80c5ef9052b835ff30 100644 (file)
--- 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 2269a92f0254a3e6b9f8ead615f9333baae7d5b2..c551d402b57dbb70c5f0bc5c04e7729585140e8b 100644 (file)
--- 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 72cada2990e99474615f19f41e12f02eb51fc5f8..704e1c78975a37342f7a0d4688076be6dbd1a7ac 100644 (file)
--- 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 b3d954bb5a8bbd7a3fda679ed86be6c21962fb4b..3da3c1efa30e53db7f133a00f5c2a5727bb8f0f7 100644 (file)
--- 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 2096cfc70b85cbe08bf767eb225e260865e49cd3..1b17aa4b3e4e7df8737c71c9be463cbbb3d76891 100644 (file)
--- 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 a9830adeae3857119a87fec7a480f164a76329a9..6cc6f8a1c00989c83b41b2d0c9621f872f5e2612 100644 (file)
--- 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 aa880ef3fa89d42336c559caadd5d41744c29123..f435a1c6f9754b00c77a61b8b22a5cd94f928ff8 100644 (file)
--- 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 15da7544c9ccdf245fa728fdc4ce07b45b54ca7c..c7df7401770328362493b1139b10757f1810b1de 100644 (file)
--- 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 1605e66b180f760306d0fa7661db2fae4a4c94ae..b38ae2e4db4a13d0a167fd88dda090f9a184d629 100644 (file)
--- 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 5657e668abe2f3cf7005be4f2f72a17877160a88..47974a4955fc394574806d61c15c636106ac09d7 100644 (file)
--- 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 e45a8640653810be66134d7ddc3d06d3ed0ad0a2..bddccb90f1b54b8361830caea2452853c9fb70fc 100644 (file)
--- 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 24b551014c1911f76252c3b2e248940d66dffcca..a0594e289ce56b84ee79454f5cb660af5cfe926b 100644 (file)
--- 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 c555ea814b7aa5e89a3d61a098cf04fe3caa9ea1..3375a869ba70b5ae8197044b14543c5f9cba99cf 100644 (file)
--- 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 2e0441ed01197da63c01d700bb26aa384d907a6c..8613b63ac81bc81ae91a016af117d6802302dfcc 100644 (file)
--- 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 1a66df1d78ca4215e55027e94927bd6957157c93..7ab9c71b68f833a67cee6952d54f70e542db6fe8 100644 (file)
--- 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 b93930ad3680bca2f15e68d0e62e8cf2c4cbc83f..43c14a22d0b179210425b6277adc203956d9faaa 100644 (file)
--- 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 3544b58d264ebcd266f447dbd0bb710a59f36f45..69abc18b28be5b47a379f482e395d3cfee61e6a3 100644 (file)
--- 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 0c54b14c46701b2af9957f7318936b7ea56c3273..952f813c43ec21a06cbe272f1455fd0c9727f127 100644 (file)
--- 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 cdcdb8427de535e3343c95b081844169b2fd48d7..fbc83d82460b01c843e335a65f4dd90f2606ca2b 100644 (file)
--- 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 9173f14e69f03fe5b4ff90378634038c7acdda96..910746e5ec161e8fe396624afff7886ba263d884 100644 (file)
--- 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'