Remove {project}-integration-{stream} jobs

When we hooked up the old merge jobs it reconnected these old
integration jobs that are not designed to work with the new
global-jjb build workflow. This caused these jobs to deploy
incomplete artifacts when this job should not be pushing
artifacts at all.

Issue: RT-52501
Change-Id: I3607b775316105be7380b97b825dd0faf15c168d
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 8228470cb2662339f40964c8c4f0a0c7151aeb8f..9ce1c94c556ec7f35e318211788d2a22131b6020 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -3,7 +3,6 @@
     name: aaa-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: aaa-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: aaa-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 54b337f1f4b77919373e2b359c0ed7687eadc1a3..d1085a28f329ea47b0f5dd0394545862b009bb5a 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -3,7 +3,6 @@
     name: alto-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -23,7 +22,6 @@
     name: alto-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -43,7 +41,6 @@
     name: alto-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index ea1f621abcc506ed22dc478e823f000da784695b..447d851608348231e9a0fed150fc77fdeeb2b4b7 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -3,7 +3,6 @@
     name: atrium-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: atrium-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: atrium-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 6d9cbdff8c7f16cf3ff40e4e151630c2fb7ca38b..5c8ee1da206d3a5a111f85a64f7abbe6c868d4fe 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -3,7 +3,6 @@
     name: bgpcep-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -30,7 +29,6 @@
     name: bgpcep-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -57,7 +55,6 @@
     name: bgpcep-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 87ba9edfe61a6cff664e65e717c92f0b1709a217..3dd2638f4d46849b28310e865e566c9fe30c2ea6 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -3,7 +3,6 @@
     name: bier-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -24,7 +23,6 @@
     name: bier-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -44,7 +42,6 @@
     name: bier-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 5b533320ab3b32f02d53520d88834e927d013e49..e6fdae19957941865b802af7bbd649d7d28b6746 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -3,7 +3,6 @@
     name: capwap-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: capwap-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: capwap-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index ea29ce165855c102d6b9a88984a4382f9e90d6ef..71b99503d6c45c9ac1a209642fd89686c69b6a5c 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -3,7 +3,6 @@
     name: cardinal-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: cardinal-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: cardinal-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index 3cc6624fffc932e6769b15f4564e5d0e65ea6467..a9beae82d26f204743b6decd3caae5211f420e04 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -3,7 +3,6 @@
     name: centinel-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: centinel-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: centinel-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index 16bd9346c853072fd9d1bd2599733e93346df11f..290f29cf8758c730a96feee1601ca978cbf6454a 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -3,7 +3,6 @@
     name: coe-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'coe'
@@ -22,7 +21,6 @@
     name: coe-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'coe'
@@ -40,7 +38,6 @@
 - project:
     name: coe-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'coe'

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 18a4ba54689462b10ea8056b061be2fa4fcb1faa..8683803c404711ea897d2b00bc4261481ed585e5 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -3,7 +3,6 @@
     name: controller-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -26,7 +25,6 @@
     name: controller-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -48,7 +46,6 @@
     name: controller-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index b97ddd3ae9724a117abbbb8ca868d1df26aea679..8ffa7a99d1c3d23db23e0e0f4d3de906f7a2931b 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -2,7 +2,6 @@
 - project:
     name: coretutorials-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -21,7 +20,6 @@
 - project:
     name: coretutorials-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -40,7 +38,6 @@
 - project:
     name: coretutorials-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 4345c250d1cc7bb7d94cb22183784f1a65f01a0a..25f05ee88758b54dae4c152fef0b84c896b75878 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -3,7 +3,6 @@
     name: daexim-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'daexim'
@@ -22,7 +21,6 @@
     name: daexim-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'daexim'

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 768046542f08b694f75d11e9e862aaa077743dee..037ebc6bebd2e6219ec8a19d74b50c2ccf33435d 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -3,7 +3,6 @@
     name: didm-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: didm-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: didm-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 99d4478be53beef4531e89dc5253db9f27c17b0e..d090eebea62b27a5ef91ce80a2e98b48c44362d1 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -3,7 +3,6 @@
     name: dlux-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: dlux-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: dlux-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index b51bb653fa9cb8e6ecc6bdf710afede5295a5c44..d87fdb4c7e3be2d087d2f7d9427b163ca770e900 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -3,7 +3,6 @@
     name: dluxapps-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'
@@ -23,7 +22,6 @@
     name: dluxapps-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'
@@ -43,7 +41,6 @@
     name: dluxapps-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index 95cd0ec48d4e942df98180b06b733d9e7ece1143..d36e97ec238cbb0ba58d3d2bcce1bf68d3c599a3 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -3,7 +3,6 @@
     name: eman-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -24,7 +23,6 @@
     name: eman-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -45,7 +43,6 @@
     name: eman-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index e6ef01382a8f47d266a43207dde04a7b5fa2a330..c3e95b8132f7849eb1de4cee0f11ad2384d69829 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -3,7 +3,6 @@
     name: faas-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: faas-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: faas-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index f7ab6e22a85940ff69056cceede35730bec660e0..37d11172b169f04ec4dff84b2bbc83a0f1cf158e 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -3,7 +3,6 @@
     name: federation-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -23,7 +22,6 @@
     name: federation-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -43,7 +41,6 @@
     name: federation-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 98abe518ae59d39cb420cb90cfb5ab61bb1fbede..2bd0758bf99c28c92cf4037d638660ded13732f3 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -3,7 +3,6 @@
     name: genius-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -30,7 +29,6 @@
     name: genius-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -55,7 +53,6 @@
     name: genius-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 1da01b19881d851339c0cb4a27ed58e4e77dea65..70c32643c7881612f1b1064db2abf462f72954f2 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -3,7 +3,6 @@
     name: groupbasedpolicy-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -30,7 +29,6 @@
     name: groupbasedpolicy-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -56,7 +54,6 @@
     name: groupbasedpolicy-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index 4b06304972cddc48bc26ad7f6583d66cce5f2570..f2e35f98a1793d155b8efb02c4f8fa4e272236d0 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -3,7 +3,6 @@
     name: vbd-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: vbd-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: vbd-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index ec2ae83fce608fff5ef3094e7bac0fdb2ee8fca0..8ebb6299014f62855c9c3d34e6697d0f107d0721 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -3,7 +3,6 @@
     name: infrautils-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -23,7 +22,6 @@
     name: infrautils-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -42,7 +40,6 @@
     name: infrautils-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 6f4d780c84cc0c26a59656e842d6e8978024a8ee..ed5b2d0aacee537127549ac1ef4c90249ed843a0 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -3,7 +3,6 @@
     name: iotdm-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -23,7 +22,6 @@
     name: iotdm-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -43,7 +41,6 @@
     name: iotdm-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index baae3ae5c831b13b3df8f84fb1ff55de1863c735..033d8978dafe2e6f975de16223610757b660e4c4 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -2,7 +2,6 @@
 - project:
     name: jsonrpc-fluorine
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
@@ -21,7 +20,6 @@
     name: jsonrpc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
@@ -39,7 +37,6 @@
 - project:
     name: jsonrpc-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
@@ -57,7 +54,6 @@
 - project:
     name: jsonrpc-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 2648d5062843b409ff7679abe5eee90568031f84..6e1af41fbbd15b7e77229a1d918dfee560365dd3 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -3,7 +3,6 @@
     name: l2switch-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -27,7 +26,6 @@
     name: l2switch-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -51,7 +49,6 @@
     name: l2switch-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 15ab15eba7071e6c52807fae7d7181078e39ebb5..49d043cb73830ad38a500660000ee90c567a0cf5 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -3,7 +3,6 @@
     name: lacp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: lacp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: lacp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 9e7085665d470bc35ad43a577f78e43c5b290ddb..4e7518c27e60ea834e232a264434354020f66ed0 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -3,7 +3,6 @@
     name: lispflowmapping-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -29,7 +28,6 @@
     name: lispflowmapping-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -55,7 +53,6 @@
     name: lispflowmapping-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index e2b3040e42b21a87ce8a0c531ca91e8313178a80..7490dd565acf4fc90c189710a21e05fcdd9edf8b 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -4,7 +4,6 @@
     jobs:
       - '{project-name}-distribution-check-{stream}':
           mvn-version: 'mvn35'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -27,7 +26,6 @@
     name: mdsal-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -49,7 +47,6 @@
     name: mdsal-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index a6c8f37a966da88019f0961d5e3e0864dadb406e..14c273883d839a75c1c8671ee8a531ad5c11927c 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -3,7 +3,6 @@
     name: messaging4transport-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -23,7 +22,6 @@
     name: messaging4transport-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -43,7 +41,6 @@
     name: messaging4transport-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index ce0ca72cd2904273e3d9246e97237f6a43af0420..3b948fca67365044d1e597d51608b6405b75f584 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -3,7 +3,6 @@
     name: natapp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -23,7 +22,6 @@
     name: natapp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -43,7 +41,6 @@
     name: natapp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 8193fc0304f9318e456791524f0f668cd3c17d41..af23ab6fdde2c847bd189578b7dc2e9407124749 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -3,7 +3,6 @@
     name: nemo-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: nemo-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: nemo-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 876e7de509fde54e94b9669a35f0c2572a5161b9..e12d7bb25d7d8ffb3144afe2551d4f45390b5efe 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -3,7 +3,6 @@
     name: netconf-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -25,7 +24,6 @@
     name: netconf-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -46,7 +44,6 @@
     name: netconf-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index e1a48d0d48d1eb39cb37f79e32757259cdd085b9..abc54479c3d6e75dcd40f4b5f96ac42e11ee0c3b 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -3,7 +3,6 @@
     name: netide-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: netide-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: netide-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 6d419e5d5e98ec0a7360d6300bb0342fc99552c4..f172ba17f5c7875607f28d6eb21e8a839de76fcc 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -3,7 +3,6 @@
     name: netvirt
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - gerrit-tox-verify
       - odl-maven-jobs

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index f3ccc81bd1572853088ac6cd986b8a4c360b267d..9c1c89196138302b00d58a19600223b0c941408c 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -3,7 +3,6 @@
     name: neutron-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -24,7 +23,6 @@
     name: neutron-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -45,7 +43,6 @@
     name: neutron-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index 6d7916b305fb652a2949542a6891f46e3c45fd15..e4c4a495a4a391c541865a66aa0eb3d34f0f6921 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -3,7 +3,6 @@
     name: next-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: next-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: next-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 23456b9e195494cecde6fae3b805544bdb679e9c..5d0dd476fc3e7f83bfc162b39927302c4615b65b 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -3,7 +3,6 @@
     name: nic-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -23,7 +22,6 @@
     name: nic-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -43,7 +41,6 @@
     name: nic-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index e19af5ebbe3e84678f0ec41b8e0eb47f76218176..eb99c400c7a4c0944a5943839a3d6be869bd13b7 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -3,7 +3,6 @@
     name: ocpplugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: ocpplugin-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: ocpplugin-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 46a237a5ce295af0568415698ba102ba92e63f2e..24da0238326a059a50b5c16bbb1d5da260b7563a 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -123,7 +123,6 @@
     name: odlparent-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - gerrit-tox-verify

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 26d1c22fc67692b2fdf8d021ba5508292085a008..5892334b09941f9f91e05fdfbbd367d95adfc6fd 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -3,7 +3,6 @@
     name: of-config-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: of-config-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: of-config-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index aa2fb79461a6dc4ad04a44737d1ee435459a2644..0d55c674560ae7a313e5018fd39ea0c073a6f1b1 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -2,7 +2,6 @@
 - project:
     name: circuitsw-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -20,7 +19,6 @@
 - project:
     name: circuitsw-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -38,7 +36,6 @@
 - project:
     name: circuitsw-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index e60832b8b5a6d45fb16d6d042a86d1d717d82d91..5a921c0cbca9301643ab6f57e4d7abceb72717e8 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -3,7 +3,6 @@
     name: openflowjava-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -23,7 +22,6 @@
     name: openflowjava-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 26807d1894b001a62de85964b1068999f21ddd59..5e1531903e3b6c33ab3c87f6403f2dd79b72eee6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -3,7 +3,6 @@
     name: openflowplugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -31,7 +30,6 @@
     name: openflowplugin-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -59,7 +57,6 @@
     name: openflowplugin-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 1193a849d7f72654eabf3d7fe080e140835ba4bf..652820f2622322e4dc6ab22c63101377011a3d2f 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -3,7 +3,6 @@
     name: ovsdb-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -24,7 +23,6 @@
     name: ovsdb-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -45,7 +43,6 @@
     name: ovsdb-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index 28be755e6cb4d7ff0abb990d826d187fcdb0cf0c..7ead8dd891291b7f28d10e61e155243863f7dc95 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -3,7 +3,6 @@
     name: p4plugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index fe6b2aefa475992a5cfdb762b7566cbd1cad6b5f..2fe013e803f211e895e3885ca295f4db938e5483 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -3,7 +3,6 @@
     name: packetcable-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: packetcable-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: packetcable-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml
index 00a68c7a34ebf90c693ef3d7bf92e27ea848b5c2..8d00a247da47406b5242d097fddb64cbbb5f158e 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -2,7 +2,6 @@
 - project:
     name: persistence-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -21,7 +20,6 @@
 - project:
     name: persistence-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -40,7 +38,6 @@
 - project:
     name: persistence-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index af4ffd6599cc55e98a564d842899ee4543739b71..9af582ca7329fb4c776314c37588a0e01e1cf94c 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -2,7 +2,6 @@
 - project:
     name: reservation-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -20,7 +19,6 @@
 - project:
     name: reservation-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -38,7 +36,6 @@
 - project:
     name: reservation-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 982ed15f462c6f04872b26f173991494e4146b49..99c856bf9a84638e2bc6027963e45b1a941a1258 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -3,7 +3,6 @@
     name: sdninterfaceapp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -23,7 +22,6 @@
     name: sdninterfaceapp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -43,7 +41,6 @@
     name: sdninterfaceapp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index a7cfe702a5d6b3b12433660fbd8b5f7467ac82db..a38ec9b221c62265fbcc48d4e6c5d13433704c9a 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -3,7 +3,6 @@
     name: sfc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -24,7 +23,6 @@
     name: sfc-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -44,7 +42,6 @@
     name: sfc-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index ecc518496ce59adf02b4a053d540b7479b12da79..53a61ecd040996805e71c4d97a606dc8190df22b 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -3,7 +3,6 @@
     name: snbi-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: snbi-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: snbi-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 9eb860f211ac236ca84906326a73711011787642..55ee922330d7e69e493f73c22219fa9d9c0c6b68 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -3,7 +3,6 @@
     name: snmp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: snmp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: snmp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 8108c8c984db6ed87512d775694e0ea40d79bbea..ecb20af3360619749ab13dc7343b52a32ccf4204 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -3,7 +3,6 @@
     name: snmp4sdn-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: snmp4sdn-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: snmp4sdn-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index ce0c3f6284473602a1ca32e7f1adece8c7d196c6..351fb888100645d36ffaa7b651ec259d91207fb7 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -3,7 +3,6 @@
     name: sxp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: sxp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: sxp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml
index 63f331149ec0091d354be259085fe78b021a379d..e75892ea79ede8761194731cd10107b87bc2f68d 100644 (file)
--- a/jjb/systemmetrics/systemmetrics.yaml
+++ b/jjb/systemmetrics/systemmetrics.yaml
@@ -2,7 +2,6 @@
 - project:
     name: systemmetrics-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'systemmetrics'
@@ -20,7 +19,6 @@
 - project:
     name: systemmetrics-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'systemmetrics'
@@ -38,7 +36,6 @@
 - project:
     name: systemmetrics-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'systemmetrics'

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 7a382b6795dc22daafef12993a635328f93aa4ea..c8147cf119209261e9d26f2ddf34d19f37aebf20 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -3,7 +3,6 @@
     name: topoprocessing-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: topoprocessing-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: topoprocessing-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 31539aa58d81ca0ee679e1916a3b2ab567f2ad5a..3f5c8fa127c0b55f5442be7ae44f3b343a4d7033 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -2,7 +2,6 @@
 - project:
     name: transportpce-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'transportpce'
@@ -20,7 +19,6 @@
 - project:
     name: transportpce-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'transportpce'
@@ -38,7 +36,6 @@
 - project:
     name: transportpce-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'transportpce'

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 38f8c87dafe58c0bd5472286991ae748797eac05..830ddc77ac04820953155bad2ff790871d7eb50c 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -3,7 +3,6 @@
     name: tsdr-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: tsdr-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: tsdr-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index ea36a8c39aeef9f2245f76f1a45cdc267018002c..b92ebd1c78e7c4d218918a4730dc0e2b9aaace48 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -3,7 +3,6 @@
     name: ttp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: ttp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: ttp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index dff7b34e44b3bcf5e3104a52471c307f834df68f..65e659cbc3d90b8cedd8f51624fba5a06e53c8f3 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -3,7 +3,6 @@
     name: unimgr-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -23,7 +22,6 @@
     name: unimgr-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -43,7 +41,6 @@
     name: unimgr-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 62be1f4d00a6b0852acd464d83e5512550bd9c3e..fab6c6277f19c6677b7604dec716aaa309ba1ead 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -3,7 +3,6 @@
     name: usc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -23,7 +22,6 @@
     name: usc-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -43,7 +41,6 @@
     name: usc-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index 109caba7186faa89cebe3d1a0e8bbe7bf1ec619a..f4fd0fa480cd60a7f5415e9ef68472ff8e6051c3 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -3,7 +3,6 @@
     name: usecplugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: usecplugin-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: usecplugin-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index e0c973e458c3724d0f4eefaac76dbc716dd51520..d5a7386eb03c0eedb44cedfb7ddefa0e6c64dae9 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -3,7 +3,6 @@
     name: vtn-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -29,7 +28,6 @@
     name: vtn-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -55,7 +53,6 @@
     name: vtn-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index bd8a0ba428a1a6ce2263837a2e80fe0fc0484ad7..c533c444c3e66453f0444e02665163f7ace98dc2 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -3,7 +3,6 @@
     name: yang-push-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -22,7 +21,6 @@
     name: yang-push-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +39,6 @@
     name: yang-push-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index 011a64509152faaf44dc196d48a83b7641355935..1358a5e88d4f39de6fc2160589c00f900db9ca6a 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -2,7 +2,6 @@
 - project:
     name: yangide-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -20,7 +19,6 @@
 - project:
     name: yangide-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -38,7 +36,6 @@
 - project:
     name: yangide-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 5dbfb07b9afe078965e736a543d0d15d1c511cc5..2812b50aafd289c43a1023287d2b8dd08aa3e0f9 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -30,7 +30,6 @@
     name: yangtools-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -59,7 +58,6 @@
     name: yangtools-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs