Manage ODL Jenkins views with view-templates

Manage ODL Jenkins views with JJB view-templates.
The generic view-templates are implemented in global-jjb
in CR's [1.] and [2.]. The changes support the following views:

    - common-view
    - csit-view
    - project-view

[1.] https://gerrit.linuxfoundation.org/infra/#/c/13268
[2.] https://gerrit.linuxfoundation.org/infra/#/c/12989

TODO: Remove the file `jjb/releng-view-templates.yaml`
releng/builder once the new version of global-jjb released.

Issue: https://jira.linuxfoundation.org/browse/RELENG-1259
Change-Id: I231584a23e3d247f6fdd5df956a951541c128f50
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 01390c0781c228430f59c6b0d86ee19350b17cbf..17bef2d6d2dfeab422b06bf33a90f227a63f7d6b 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -74,8 +74,8 @@
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: aaa
-    description: 'List of aaa jobs'
-    regex: '^aaa-.*'
-    <<: *releng_view_common
+- project:
+    name: aaa-view
+    views:
+      - project-view
+    project-name: aaa

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 2c06d8482bd62e28db47c0d8ca0926129f0665a7..bde65374976126bafbe24f0718023f3025e4d5d9 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -66,8 +66,8 @@
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: alto
-    description: 'List of alto jobs'
-    regex: '^alto-.*'
-    <<: *releng_view_common
+- project:
+    name: alto-view
+    views:
+      - project-view
+    project-name: alto

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
index 2f7052779831a133e8d8f4165b2c71e820222f76..b9a9761215044ce3f932877d849dacc86e2ddf94 100644 (file)
--- a/jjb/archetypes/archetypes.yaml
+++ b/jjb/archetypes/archetypes.yaml
@@ -57,8 +57,8 @@
     branch: 'master'
     mvn-settings: 'archetypes-settings'
 
-- view:
-    name: archetypes
-    regex: '^archetypes-.*'
-    description: 'List of archetypes jobs'
-    <<: *releng_view_common
+- project:
+    name: archetypes-view
+    views:
+      - project-view
+    project-name: archetypes

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 7818f8045d759551a6b5cb73e8667c8a73c21e2a..f0a200402575c3fbb1e9f102e66f7745318671b9 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -43,8 +43,8 @@
         **/target/feature/feature.xml
     # TODO: **/*.hprof is too large, compress with xz first
 
-- view:
-    name: autorelease
-    description: 'List of autorelease jobs'
-    regex: '^autorelease-.*'
-    <<: *releng_view_common
+- project:
+    name: autorelease-view
+    views:
+      - project-view
+    project-name: autorelease

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 2018d4e0752927dee689aad7419b2be443280ae4..aa10d9a1e481d0a4852c0375a276eec0bc4eb908 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -99,8 +99,8 @@
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: bgpcep
-    description: 'List of bgpcep jobs'
-    regex: '^bgpcep-.*'
-    <<: *releng_view_common
+- project:
+    name: bgpcep-view
+    views:
+      - project-view
+    project-name: bgpcep

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 953bfee2def412af6c2c00779c20d090e075c5a5..bbebe4c86fc43af4aed1c8831cf10cbbf09eb048 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -69,8 +69,8 @@
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: bier
-    description: 'List of bier jobs'
-    regex: '^bier-.*'
-    <<: *releng_view_common
+- project:
+    name: bier-view
+    views:
+      - project-view
+    project-name: bier

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 3ecfeb5f1d20b904ce10d75ee8cf67494200764c..55af0a842e071011dcf3ebf8f056b88913ca5a62 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -62,8 +62,9 @@
     mvn-settings: 'capwap-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: capwap
-    description: 'List of capwap jobs'
-    regex: '^capwap-.*'
-    <<: *releng_view_common
+
+- project:
+    name: capwap-view
+    views:
+      - project-view
+    project-name: capwap

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index e13cf73b3ee6c38babbe7cf70a22a4e86d01bd0a..24fad7f9afe868017b985e3869cc864a4fdbb070 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -62,8 +62,8 @@
     mvn-settings: 'cardinal-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: cardinal
-    description: 'List of cardinal jobs'
-    regex: '^cardinal-.*'
-    <<: *releng_view_common
+- project:
+    name: cardinal-view
+    views:
+      - project-view
+    project-name: cardinal

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index ac2a045fb4051adf13953806a62cbd54e8361ae9..fc12a575bfa3aa4012dba3a14634398e5e73db52 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -62,8 +62,8 @@
     mvn-settings: 'centinel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: centinel
-    description: 'List of centinel jobs'
-    regex: '^centinel-.*'
-    <<: *releng_view_common
+- project:
+    name: centinel-view
+    views:
+      - project-view
+    project-name: centinel

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index e18132ae8b474fe008620c888a092e85f6433fc4..8b01c9e56ca5c8b2082bb95ccd5d44cf8eec1bfa 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -82,8 +82,8 @@
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: coe
-    description: 'List of coe jobs'
-    regex: '^coe-.*'
-    <<: *releng_view_common
+- project:
+    name: coe-view
+    views:
+      - project-view
+    project-name: coe

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 0fe1d192014eac704d6256aa237525f86aef9b4e..7cd63e38405e9c5edf7a5361f97369f92afe1228 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -88,8 +88,8 @@
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
 
-- view:
-    name: controller
-    description: 'List of controller jobs'
-    regex: '^controller-.*'
-    <<: *releng_view_common
+- project:
+    name: controller-view
+    views:
+      - project-view
+    project-name: controller

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index c62b1b4079c3a609859d44bf968f34d4a3be1e53..98897a155f893277985cbf567c45a8e55828de34 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -65,8 +65,8 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     build-timeout: 120
 
-- view:
-    name: coretutorials
-    description: 'List of coretutorials jobs'
-    regex: '^coretutorials-.*'
-    <<: *releng_view_common
+- project:
+    name: coretutorials-view
+    views:
+      - project-view
+    project-name: coretutorials

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 9852536a235b52a198035ea3c0dc4ef527ad7b77..99057ec6fb5dc56681ef72d5f0b3f420b3c72890 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -74,8 +74,8 @@
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: daexim
-    description: 'List of daexim jobs'
-    regex: '^daexim-.*'
-    <<: *releng_view_common
+- project:
+    name: daexim-view
+    views:
+      - project-view
+    project-name: daexim

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index 11a7b2cd01a0128694173fb016f5536af94d9ba2..baf62c47e26c3a165113693ace6c69b9c239f388 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'didm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: didm
-    description: 'List of didm jobs'
-    regex: '^didm-.*'
-    <<: *releng_view_common
+- project:
+    name: didm-view
+    views:
+      - project-view
+    project-name: didm

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 4308da7d41a7a9ecec40f2e39d6ef81c4fcb9a1b..d3aa75ecfa05e85b56152f9f50f3074b74e89201 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: dlux
-    description: 'List of dlux jobs'
-    regex: '^dlux-.*'
-    <<: *releng_view_common
+- project:
+    name: dlux-view
+    views:
+      - project-view
+    project-name: dlux

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index 85aefe9de3fafb1b6dd2f4859b6ae895c812c598..14e23e2dfd65002e687655620fc21a40f56802bd 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -66,8 +66,8 @@
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: dluxapps
-    description: 'List of dluxapps jobs'
-    regex: '^dluxapps-.*'
-    <<: *releng_view_common
+- project:
+    name: dluxapps-view
+    views:
+      - project-view
+    project-name: dluxapps

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 7ce8b8cc3712bdcb1ada11df28be85e6afaaf248..53ed32f95cd24cd7fe9bb056a4e57c57951e1ad5 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -21,8 +21,8 @@
     rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight/32322/
     rtd-token: 86e54dd38c651e2164ea63c183ae601d19cd1f3c
 
-- view:
-    name: docs
-    description: 'List of docs jobs'
-    regex: '^docs-.*'
-    <<: *releng_view_common
+- project:
+    name: docs-view
+    views:
+      - project-view
+    project-name: docs

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index 919c4719b1b4fcde7d78f5c6d302692cacea6f42..be113bbe2615604d97cbf5e22235764b6fcb5667 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -67,8 +67,8 @@
     mvn-settings: 'eman-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: eman
-    description: 'List of eman jobs'
-    regex: '^eman-.*'
-    <<: *releng_view_common
+- project:
+    name: eman-view
+    views:
+      - project-view
+    project-name: eman

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index bf762128ab8c9aab115a1c2a6226952b06f254df..1cc73c323edef59132bb845863b42ff1dc3a3198 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'faas-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: faas
-    description: 'List of faas jobs'
-    regex: '^faas-.*'
-    <<: *releng_view_common
+- project:
+    name: faas-view
+    views:
+      - project-view
+    project-name: faas

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 114719cb31352821c6ac40a033cc577a77fd74c6..1769fe85d5882e4b8f53b640dd71e0a4fde49765 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -65,8 +65,8 @@
     mvn-settings: 'federation-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: federation
-    description: 'List of federation jobs'
-    regex: '^federation-.*'
-    <<: *releng_view_common
+- project:
+    name: federation-view
+    views:
+      - project-view
+    project-name: federation

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 6461944d360e8373e671587ac4907dedf51941e8..4036ef22cef63f6121736caa746a13d2946decf2 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -103,8 +103,8 @@
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: genius
-    description: 'List of genius jobs'
-    regex: '^genius-.*'
-    <<: *releng_view_common
+- project:
+    name: genius-view
+    views:
+      - project-view
+    project-name: genius

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 607b26b738692e0676e517b5a28c11fd54c85153..25cbca1dc9b00f088e6d585210da657e3825ebaf 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -87,8 +87,8 @@
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: groupbasedpolicy
-    description: 'List of groupbasedpolicy jobs'
-    regex: '^groupbasedpolicy-.*'
-    <<: *releng_view_common
+- project:
+    name: groupbasedpolicy-view
+    views:
+      - project-view
+    project-name: groupbasedpolicy

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index ff6d95171693d78e337f3e82a6351e84818bdde8..659a5765527f5d883be8afeced29d28d5c32fbee 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: vbd
-    description: 'List of vbd jobs'
-    regex: '^vbd-.*'
-    <<: *releng_view_common
+- project:
+    name: vbd-view
+    views:
+      - project-view
+    project-name: vbd

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 6ccd941b0e96a5a5bfcfda659a26b1b0e2705381..563eb54f694c76975d65e6893f9b79035c5ae694 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -84,8 +84,8 @@
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: infrautils
-    description: 'List of infrautils jobs'
-    regex: '^infrautils-.*'
-    <<: *releng_view_common
+- project:
+    name: infrautils-view
+    views:
+      - project-view
+    project-name: infrautils

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 30cfc318aa8ff8b17510854ad2c97e0081b9bcf5..451d61f1fc605391cb237e1588b06a62799b3fbd 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -251,8 +251,9 @@
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: distribution
-    description: 'List of distribution jobs'
-    regex: '^(integration-)?distribution-.*'
-    <<: *releng_view_common
+- project:
+    name: distribution-view
+    views:
+      - common-view
+    view-name: distribution
+    view-regex: '^(integration-)?distribution-.*'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 43fa3a267b97b23369038d120615bb979df1bf23..25285d478a9ce81c96ce1b74e2903309d8f8c33d 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -570,11 +570,11 @@
     publishers:
       - lf-infra-publish
 
-- view:
-    name: integration
-    description: 'List of integration jobs'
-    regex: '^integration-.*'
-    <<: *releng_view_common
+- project:
+    name: integration-view
+    views:
+      - project-view
+    project-name: integration
 
 - view:
     name: csit-stable-f

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 6a2589070424896f3d512e0855056781ade7f12b..784e75ccdf80c98491c313e240b44d3edb694ef0 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -65,8 +65,8 @@
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: iotdm
-    description: 'List of iotdm jobs'
-    regex: '^iotdm-.*'
-    <<: *releng_view_common
+- project:
+    name: iotdm-view
+    views:
+      - project-view
+    project-name: iotdm

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 400b6d7f341fd05a8f6f74940697d5da92059f9a..5059f3172e785d9f8fb0f37b675e0fcb9672b436 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -62,8 +62,8 @@
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: jsonrpc
-    description: 'List of jsonrpc jobs'
-    regex: '^jsonrpc-.*'
-    <<: *releng_view_common
+- project:
+    name: jsonrpc-view
+    views:
+      - project-view
+    project-name: jsonrpc

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 4f14ebcbdb303423dd44d38dcf31fbde46ceae24..176de3580dfcb6f6e5ea164abb657c99bf8f19e0 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -76,8 +76,8 @@
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
 
-- view:
-    name: l2switch
-    description: 'List of l2switch jobs'
-    regex: '^l2switch-.*'
-    <<: *releng_view_common
+- project:
+    name: l2switch-view
+    views:
+      - project-view
+    project-name: l2switch

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 4a81fba6db65e924fae1d907f1bdde5e41716ea1..67ac76291d9bfa7b6248aa95e2eb55a5186a1aa4 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'lacp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: lacp
-    description: 'List of lacp jobs'
-    regex: '^lacp-.*'
-    <<: *releng_view_common
+- project:
+    name: lacp-view
+    views:
+      - project-view
+    project-name: lacp

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 1f9c0d23b01b7d60a5cabe4edd6c33c7b41b5596..f232f2ec0ef18d0a3495fee8e1bd9ba7acd0e91e 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -132,8 +132,8 @@
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
-- view:
-    name: lf-infra
-    description: 'List of lf-infra jobs'
-    regex: '^lf-infra-.*'
-    <<: *releng_view_common
+- project:
+    name: lf-infra-view
+    views:
+      - project-view
+    project-name: lf-infra

diff --git a/jjb/lfn/lfn.yaml b/jjb/lfn/lfn.yaml
index 505a86a53a0cf70bb60ec0fba134bbf892e25721..68d53961661a562b2456f9ad660cf2fea53d5bc3 100644 (file)
--- a/jjb/lfn/lfn.yaml
+++ b/jjb/lfn/lfn.yaml
@@ -17,8 +17,8 @@
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
-- view:
-    name: lfn
-    description: 'List of LF Networking jobs'
-    regex: '^lfn-.*'
-    <<: *releng_view_common
+- project:
+    name: lfn-view
+    views:
+      - project-view
+    project-name: lfn-process

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 5420877901a9813b0d9198f16717ebbdc14062de..1ff72034e717507d25fa35c936403f8c5a75fab1 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -95,8 +95,8 @@
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
 
-- view:
-    name: lispflowmapping
-    description: 'List of lispflowmapping jobs'
-    regex: '^lispflowmapping-.*'
-    <<: *releng_view_common
+- project:
+    name: lispflowmapping-view
+    views:
+      - project-view
+    project-name: lispflowmapping

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 8e4973e3edeb95511957650e16698427cb255df5..475c86e904f07fa9e641dc7f8e98032c8fdcc128 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -138,8 +138,8 @@
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'
 
-- view:
-    name: mdsal
-    description: 'List of mdsal jobs'
-    regex: '^mdsal-.*'
-    <<: *releng_view_common
+- project:
+    name: mdsal-view
+    views:
+      - project-view
+    project-name: mdsal

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index 84ceac995803467618d3021d95302b558734f20e..26098a6fa192febcd89e504112696e2b99fba5a8 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -64,8 +64,8 @@
     mvn-settings: 'natapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: natapp
-    description: 'List of natapp jobs'
-    regex: '^natapp-.*'
-    <<: *releng_view_common
+- project:
+    name: natapp-view
+    views:
+      - project-view
+    project-name: natapp

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 531c603dca933b61a1a37c06a3e067dc37550565..dc24a888f044c146c914ec86b0d7a2224bea8e76 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: nemo
-    description: 'List of nemo jobs'
-    regex: '^nemo-.*'
-    <<: *releng_view_common
+- project:
+    name: nemo-view
+    views:
+      - project-view
+    project-name: nemo

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 33024be2af76dad57165b3df94ec384d2dacb283..a5083e1d87a60b491e3be25daec678e3817fa5c5 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -84,8 +84,8 @@
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
 
-- view:
-    name: netconf
-    description: 'List of netconf jobs'
-    regex: '^netconf-.*'
-    <<: *releng_view_common
+- project:
+    name: netconf-view
+    views:
+      - project-view
+    project-name: netconf

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index 44281fe5f01ec75d1444e96400b5845dff09133c..4a6e1609b68e7cdee5a87f3ef7c7ce43b0ea8196 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'netide-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: netide
-    description: 'List of netide jobs'
-    regex: '^netide-.*'
-    <<: *releng_view_common
+- project:
+    name: netide-view
+    views:
+      - project-view
+    project-name: netide

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 104af96941c508b26704bafb0fb1fbe48db63455..02039887a075ee64bde7ed607e474077a6383b7c 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -46,20 +46,23 @@
     name: netvirt-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: netvirt
-    description: 'List of netvirt jobs'
-    regex: '^netvirt-.*'
-    <<: *releng_view_common
+- project:
+    name: netvirt-csit-view
+    views:
+      - csit-view
+    view-name: netvirt-csit
+    view-description: 'List of netvirt-csit jobs'
+    view-regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
 
-- view:
-    name: netvirt-csit
-    description: 'List of netvirt-csit jobs'
-    regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
-    <<: *integration_view_csit
+- project:
+    name: netvirt-view
+    views:
+      - project-view
+    project-name: netvirt

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index f4f348edc26745d876e2a0421dfe222a5d44c86b..20e835ed5e4028bb0178bbec050beca6dd4f1030 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -69,8 +69,8 @@
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: neutron
-    description: 'List of neutron jobs'
-    regex: '^neutron-.*'
-    <<: *releng_view_common
+- project:
+    name: neutron-view
+    views:
+      - project-view
+    project-name: neutron

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index 2a29e6dcdaf2bda1358ac17dbc4a0d994873ae8a..ed3e16aed51e31693c130171103a8418895597a8 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'next-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: next
-    description: 'List of next jobs'
-    regex: '^next-.*'
-    <<: *releng_view_common
+- project:
+    name: next-view
+    views:
+      - project-view
+    project-name: next

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 77176cfab30c76024c7a938ba9457a4c5c0c31e0..c8421b900d5d1f0497d3ae1208951dd13584c6b1 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -65,8 +65,8 @@
     mvn-settings: 'nic-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: nic
-    description: 'List of nic jobs'
-    regex: '^nic-.*'
-    <<: *releng_view_common
+- project:
+    name: nic-view
+    views:
+      - project-view
+    project-name: nic

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index 36dc2f892a8ee32ac99096d564678dc155805528..c07b59a6581e8490d059045a9f98556c07c1c98c 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -55,14 +55,15 @@
     name: ocpplugin-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'master'
     mvn-settings: 'ocpplugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: ocpplugin
-    description: 'List of ocpplugin jobs'
-    regex: '^ocpplugin-.*'
-    <<: *releng_view_common
+- project:
+    name: ocpplugin-view
+    views:
+      - project-view
+    project-name: ocpplugin

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index a1abf4669de961921764172b9c3c49cd0fea6658..63601346001b539856e7bc802efb7dabb7869fba 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -103,8 +103,8 @@
     mvn-settings: 'odlparent-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: odlparent
-    description: 'List of odlparent jobs'
-    regex: '^odlparent-.*'
-    <<: *releng_view_common
+- project:
+    name: odlparent-view
+    views:
+      - project-view
+    project-name: odlparent

diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml
index 110fa84a6de94ee6fb7c219f5c7ceef7cfb7ab00..60055fe106140b4be9ddaffe317e962be017c8f2 100644 (file)
--- a/jjb/odltools/odltools.yaml
+++ b/jjb/odltools/odltools.yaml
@@ -21,8 +21,8 @@
     build-node: centos7-builder-2c-2g
     build-timeout: 60
 
-- view:
-    name: odltools
-    description: 'List of odltools jobs'
-    regex: '^odltools-.*'
-    <<: *releng_view_common
+- project:
+    name: odltools-view
+    views:
+      - project-view
+    project-name: odltools

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 37f2475a8f1217ebb6a548d0a115de2f24213ab0..c4baf3664d86abcfee2a55b2dd5b265c11e18b9e 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: of-config
-    description: 'List of of-config jobs'
-    regex: '^of-config-.*'
-    <<: *releng_view_common
+- project:
+    name: of-config-view
+    views:
+      - project-view
+    project-name: of-config

diff --git a/jjb/openci/openci-odl-daily-jobs.yaml b/jjb/openci/openci-odl-daily-jobs.yaml
index 350306a6f5a91ff385487d8c74d69add4b44a50c..8cb06fe70766355885b06fb56c03fb99295a4a08 100644 (file)
--- a/jjb/openci/openci-odl-daily-jobs.yaml
+++ b/jjb/openci/openci-odl-daily-jobs.yaml
@@ -92,8 +92,8 @@
           echo "----------------------------------"
           echo " Promoted ODL Autorelease artifact as release candidate!"
 
-- view:
-    name: openci
-    description: 'List of openci jobs'
-    regex: '^openci-.*'
-    <<: *releng_view_common
+- project:
+    name: openci-odl-view
+    views:
+      - project-view
+    project-name: openci-odl

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 4e63550a9c1da0e1adf4db6fd9ce91dc55734939..3b30d6118b5dde044892b1da963b149d9cb72ce6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -99,6 +99,7 @@
     name: openflowplugin-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
@@ -108,14 +109,15 @@
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: openflowplugin
-    description: 'List of openflowplugin jobs'
-    regex: '^openflowplugin-.*'
-    <<: *releng_view_common
+- project:
+    name: openflowplugin-view
+    views:
+      - project-view
+    project-name: 'openflowplugin'
 
-- view:
-    name: openflowplugin-oxygen
-    description: 'List of openflowplugin oxygen jobs'
-    regex: 'openflowplugin-.*-oxygen'
-    <<: *releng_view_common
+- project:
+    name: openflowplugin-oxygen-view
+    views:
+      - common-view
+    view-name: 'openflowplugin-oxygen'
+    view-regex: '^openflowplugin-.*-oxygen'

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 640f4213bb1a0f764b86010499bcbcce2f8bbb26..5d793db6e0df06c8a6ffe47457899b3f48575179 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -126,8 +126,8 @@
           email-prefix: '[opflex]'
       - lf-infra-publish
 
-- view:
-    name: opflex
-    description: 'List of opflex jobs'
-    regex: '^opflex-.*'
-    <<: *releng_view_common
+- project:
+    name: opflex-view
+    views:
+      - project-view
+    project-name: opflex

diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml
index ea6cbc85b086b4097df528c99f2bdfb7cfae97a8..6e7ef19a7661b3e7ac7877eb469c8b613d196da4 100644 (file)
--- a/jjb/ovil/ovil.yaml
+++ b/jjb/ovil/ovil.yaml
@@ -66,8 +66,8 @@
     mvn-settings: 'ovil-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: ovil
-    description: 'List of ovil jobs'
-    regex: '^ovil-.*'
-    <<: *releng_view_common
+- project:
+    name: ovil-view
+    views:
+      - project-view
+    project-name: ovil

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 3553845105175b2d7a4e80c2bf386fdf2708407f..a62d9800a3a81a313e9e7f58f9553ab12b795477 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -69,8 +69,8 @@
     # Used by the release job
     staging-profile-id: a68b188166958
 
-- view:
-    name: ovsdb
-    description: 'List of ovsdb jobs'
-    regex: '^ovsdb-.*'
-    <<: *releng_view_common
+- project:
+    name: ovsdb-view
+    views:
+      - project-view
+    project-name: ovsdb

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index d96dd73e99716168106aa407c6e76f6034685f48..6025be9a1e0b149f0ed1fd5eea00f6a431ce709e 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -65,8 +65,8 @@
     mvn-settings: 'p4plugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: p4plugin
-    description: 'List of p4plugin jobs'
-    regex: '^p4plugin-.*'
-    <<: *releng_view_common
+- project:
+    name: p4plugin-view
+    views:
+      - project-view
+    project-name: p4plugin

diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
index c3dca13bce26ee8e5fedcdfb90b44102c12a9f42..ba354da81c7c697682c14561c45adc194bf10650 100644 (file)
--- a/jjb/packaging/ansible.yaml
+++ b/jjb/packaging/ansible.yaml
@@ -106,3 +106,9 @@
 
     publishers:
       - lf-infra-publish
+
+- project:
+    name: ansible-view
+    views:
+      - project-view
+    project-name: ansible

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 9c9174ec96429a150ecb4b084f27f81bd6afc0e9..516c5b572921ccff13dfc035d113b031aef29314 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -606,8 +606,8 @@
     publishers:
       - lf-infra-publish
 
-- view:
-    name: packaging
-    description: 'List of packaging, ansible and puppet jobs'
-    regex: '^packaging.*|ansible.*|puppet.*'
-    <<: *releng_view_common
+- project:
+    name: packaging-view
+    views:
+      - project-view
+    project-name: packaging

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index 8dfc9de3ba3ce7ef212428d5a83418df38bf5220..c9efe59721efdfe3e781b32e9a7fb3487f3b2c63 100644 (file)
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -118,3 +118,9 @@
 
     publishers:
       - lf-infra-publish
+
+- project:
+    name: puppet-view
+    views:
+      - project-view
+    project-name: puppet

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index af6a871cf4944ff99330c833bc48edf52d827fda..7d500b4e9a2908c59a495f5e35ebb2bce4b79785 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: packetcable
-    description: 'List of packetcable jobs'
-    regex: '^packetcable-.*'
-    <<: *releng_view_common
+- project:
+    name: packetcable-view
+    views:
+      - project-view
+    project-name: packetcable

diff --git a/jjb/releng-view-templates.yaml b/jjb/releng-view-templates.yaml
new file mode 100644 (file)
index 0000000..d19b1b1
--- /dev/null
+++ b/jjb/releng-view-templates.yaml
@@ -0,0 +1,116 @@
+---
+# TODO: Remove this files after the next global-jjb 2.6.x release
+# which supports the view-templates.
+# This file is temporariy added here from the below changes from global-jjb.
+# This file is included here to avoid rebases.
+# https://gerrit.linuxfoundation.org/infra/#/c/13268
+# https://gerrit.linuxfoundation.org/infra/#/c/12989
+
+########################
+# common view template #
+########################
+
+- lf_view_common_columns: &lf_view_common_columns
+    name: lf-view-common-columns
+
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+
+- view-template:
+    id: 'common-view'
+    name: '{view-name}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    view-description: 'View using common-view template.'
+    view-filter-executors: false
+    view-filter-queue: false
+    view-recurse: false
+
+    ######################
+    # view Configuration #
+    ######################
+
+    view-type: list
+    description: '{view-description}'
+    filter-executors: '{view-filter-executors}'
+    filter-queue: '{view-filter-queue}'
+    recurse: '{view-recurse}'
+    regex: '{view-regex}'
+    <<: *lf_view_common_columns
+
+######################
+# CSIT view template #
+######################
+
+- view-template:
+    id: 'csit-view'
+    name: '{view-name}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    view-description: 'CSIT jobs.'
+    view-filter-executors: false
+    view-filter-queue: false
+    view-recurse: false
+
+    ######################
+    # view Configuration #
+    ######################
+
+    view-type: list
+    description: '{view-description}'
+    filter-executors: '{view-filter-executors}'
+    filter-queue: '{view-filter-queue}'
+    recurse: '{view-recurse}'
+    regex: '{view-regex}'
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - robot-list
+
+#########################
+# project view template #
+#########################
+
+- view-template:
+    id: 'project-view'
+    name: '{project-name}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    view-filter-executors: false
+    view-filter-queue: false
+    view-recurse: false
+
+    ######################
+    # view Configuration #
+    ######################
+
+    view-type: list
+    description: 'List of jobs for {project-name}.'
+    filter-executors: '{view-filter-executors}'
+    filter-queue: '{view-filter-queue}'
+    recurse: '{view-recurse}'
+    regex: '^{project-name}-.*'
+    <<: *lf_view_common_columns
+

diff --git a/jjb/releng-views.yaml b/jjb/releng-views.yaml
index 6d879573e6eda69b08c930f36e85de5c04793a89..cd938b85bd9856d577bb3709dbd319c8ebc7f15e 100644 (file)
--- a/jjb/releng-views.yaml
+++ b/jjb/releng-views.yaml
@@ -33,17 +33,16 @@
       - robot-list
     recurse: false
 
-- view:
+- project:
     name: '00-Empty View'
-    description: >
+    views:
+      - common-view
+    view-name: '00-Empty View'
+    view-description: >
       Empty job view. This is used as the default landing view to keep the
       Jenkins UI responding better while a) under high load and b) when there
-      are a lot of jobs defined in the system'
-    view-type: list
-    filter-executors: false
-    filter-queue: false
-    recurse: false
-    regex: ''
+      are a lot of jobs defined in the system
+    view-regex: ''
 
 - view:
     name: 01-Recent
@@ -55,11 +54,13 @@
         check-start-time: true
     <<: *releng_view_common
 
-- view:
+- project:
     name: All-Sonar
-    regex: '.*-sonar$'
-    description: 'List of Sonar jobs'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: All-Sonar
+    view-regex: '.*-sonar$'
+    view-description: 'List of Sonar jobs'
 
 - view:
     name: CLM
@@ -79,105 +80,139 @@
       - policy-violations
     recurse: false
 
-- view:
+- project:
     name: CSIT-1node
-    description: 'List of CSIT 1node jobs'
-    regex: '^.*-csit-1node.*'
-    <<: *integration_view_csit
+    views:
+      - csit-view
+    view-name: CSIT-1node
+    view-description: 'List of CSIT 1node jobs'
+    view-regex: '^.*-csit-1node.*'
 
-- view:
+- project:
     name: CSIT-3node
-    description: 'List of CSIT 3node jobs'
-    regex: '^.*-csit-3node.*'
-    <<: *integration_view_csit
+    views:
+      - csit-view
+    view-name: CSIT-3node
+    view-description: 'List of CSIT 3node jobs'
+    view-regex: '^.*-csit-3node.*'
 
-- view:
+- project:
     name: CSIT
-    description: 'List of CSIT jobs'
-    regex: '^.*-csit-.*'
-    <<: *integration_view_csit
+    views:
+      - csit-view
+    view-name: CSIT
+    view-description: 'List of CSIT jobs'
+    view-regex: '^.*-csit-.*'
 
-- view:
+- project:
     name: CSIT-Verify
-    description: 'List of CSIT Verify jobs'
-    regex: '^.*-csit-verify.*'
-    <<: *integration_view_csit
+    views:
+      - csit-view
+    view-name: CSIT-Verify
+    view-description: 'List of CSIT Verify jobs'
+    view-regex: '^.*-csit-verify.*'
 
-- view:
+- project:
     name: Distribution-Check
-    description: 'List of Distribution Check jobs'
-    regex: '.*-distribution.*-check-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Distribution-Check
+    view-description: 'List of Distribution Check jobs'
+    view-regex: '.*-distribution.*-check-.*'
 
-- view:
+- project:
     name: Distribution-Jobs
-    description: >
+    views:
+      - common-view
+    view-name: Distribution-Jobs
+    view-description: >
         List of Distribution jobs (test, check, merge, deploy, offline, verify)
-    regex: '^.*-distribution-(?!(test|check|merge|deploy|offline|verify)).*'
-    <<: *releng_view_common
+    view-regex: '^.*-distribution-(?!(test|check|merge|deploy|offline|verify)).*'
 
-- view:
+- project:
     name: Gate
-    description: 'List of Gate jobs'
-    regex: '.*-gate-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Gate
+    view-description: 'List of Gate jobs'
+    view-regex: '.*-gate-.*'
 
-- view:
+- project:
     name: Integration
-    description: 'List of Integration jobs'
-    regex: '.*-integration-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Integration
+    view-description: 'List of Integration jobs'
+    view-regex: '.*-integration-.*'
 
-- view:
+- project:
     name: Merge-Jobs
-    description: 'List of Merge jobs'
-    regex: '.*-merge-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Merge-Jobs
+    view-description: 'List of Merge jobs'
+    view-regex: '.*-merge-.*'
 
-- view:
+- project:
     name: Patch-Test
-    description: 'List of Patch-Test jobs, for prioritizing jobs via the Job Priorities plugin'
-    regex: '.*-patch-test-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Patch-Test
+    view-description: 'List of Patch-Test jobs, for prioritizing jobs via the Job Priorities plugin'
+    view-regex: '.*-patch-test-.*'
 
-- view:
+- project:
     name: Periodic
-    description: 'List of Periodic jobs'
-    regex: '[a-zA-Z0-9]+-periodic-[a-zA-Z0-9]+'
-    <<: *releng_view_common
-
-- view:
+    project: Periodic
+    project-name: Periodic
+    view-name: Periodic
+    views:
+      - common-view
+    view-description: 'List of Periodic jobs'
+    view-regex: '[a-zA-Z0-9]+-periodic-[a-zA-Z0-9]+'
+
+- project:
     name: Release
-    description: 'List of Release jobs'
-    regex: '.*-release-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Release
+    view-description: 'List of Release jobs'
+    view-regex: '.*-release-.*'
 
-- view:
+- project:
     name: Sanity
-    description: 'List of Sanity jobs'
-    regex: '.*-sanity-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Sanity
+    view-description: 'List of Sanity jobs'
+    view-regex: '.*-sanity-.*'
 
-- view:
+- project:
     name: Thirdparty
-    description: 'List of ODL Nexus Thirdparty dependencies jobs'
-    regex: '.*-thirdparty-.*'
-    <<: *releng_view_common
-
-- view:
-    name: Validate
-    description: 'List of Validate jobs'
-    regex: '.*-validate-autorelease-.*'
-    <<: *releng_view_common
-
-- view:
+    views:
+      - common-view
+    view-name: Thirdparty
+    view-description: 'List of ODL Nexus Thirdparty dependencies jobs'
+    view-regex: '.*-thirdparty-.*'
+
+- project:
+    name: Validate-AR
+    views:
+      - common-view
+    view-name: Validate
+    view-description: 'List of Validate jobs'
+    view-regex: '.*-validate-autorelease-.*'
+
+- project:
     name: Verify
-    description: 'List of Verify jobs, exluding CSIT jobs'
-    regex: '^(?!.*-csit).*-verify-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Verify
+    view-description: 'List of Verify jobs, exluding CSIT jobs'
+    view-regex: '^(?!.*-csit).*-verify-.*'
 
-- view:
+- project:
     name: builder
-    description: 'List of builder jobs'
-    regex: '^builder-.*'
-    <<: *releng_view_common
+    views:
+      - project-view
+    project-name: builder

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index 8f16f15412caf7d1a829bec2d0047c7aa29831a0..146c188931ba94c18d602739f13abe1681e5d2f3 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -58,6 +58,7 @@
     name: sdninterfaceapp-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'
@@ -65,8 +66,8 @@
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: sdninterfaceapp
-    description: 'List of sdninterfaceapp jobs'
-    regex: '^sdninterfaceapp-.*'
-    <<: *releng_view_common
+- project:
+    name: sdninterfaceapp-view
+    views:
+      - project-view
+    project-name: sdninterfaceapp

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index dcd019835bd268a650fa757e2fbbe5f76a63a35e..98801745618fb27223023542db4d9c97dfb6e44e 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -39,6 +39,7 @@
     name: serviceutils-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'serviceutils'
     project-name: 'serviceutils'
     branch: 'master'
@@ -46,8 +47,8 @@
     mvn-settings: 'serviceutils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: serviceutils
-    description: 'List of serviceutils jobs'
-    regex: '^serviceutils-.*'
-    <<: *releng_view_common
+- project:
+    name: serviceutils-view
+    views:
+      - project-view
+    project-name: serviceutils

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 2633981ab8972fc9b2d5c0118cfe7dc08f724b63..4e659c575643eee72f1865f4361d4cf6ad31154b 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -84,8 +84,8 @@
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
 
-- view:
-    name: sfc
-    description: 'List of sfc jobs'
-    regex: '^sfc-.*'
-    <<: *releng_view_common
+- project:
+    name: sfc-view
+    views:
+      - project-view
+    project-name: sfc

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index f220373229c8cb5c342507018ad5301e87e4ba22..9d6ef95f5bb6b46bc2d48b6ac31a449f2f28cec0 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'snbi-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: snbi
-    description: 'List of snbi jobs'
-    regex: '^snbi-.*'
-    <<: *releng_view_common
+- project:
+    name: snbi-view
+    views:
+      - project-view
+    project-name: snbi

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 881caab1819e757ddb61ca45e22eb4a0b361c423..10a13ea7912921135a4d4a30094e877f8ba6556b 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: snmp
-    description: 'List of snmp jobs'
-    regex: '^snmp-.*'
-    <<: *releng_view_common
+- project:
+    name: snmp-view
+    views:
+      - project-view
+    project-name: snmp

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 570a42948dad82ba69df9b8ecc6d6c1781e001c8..228b19f42d54ffd7e0b201bec28bbcee7d328b45 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -55,14 +55,15 @@
     name: snmp4sdn-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: snmp4sdn
-    description: 'List of snmp4sdn jobs'
-    regex: '^snmp4sdn-.*'
-    <<: *releng_view_common
+- project:
+    name: snmp4sdn-view
+    views:
+      - project-view
+    project-name: snmp4sdn

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 6910317ec056ca71bc9443744abd94b335c79ae8..00ba8856e59547ea2bacfeb0ad9ac31b0ec4542e 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -71,8 +71,8 @@
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: sxp
-    description: 'List of sxp jobs'
-    regex: '^sxp-.*'
-    <<: *releng_view_common
+- project:
+    name: sxp-view
+    views:
+      - project-view
+    project-name: sxp

diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml
index 09d519ea140218d3db1dfad2dca005e5432d6dbf..87c311e3e65d407d0a85616246f90f5534846986 100644 (file)
--- a/jjb/systemmetrics/systemmetrics.yaml
+++ b/jjb/systemmetrics/systemmetrics.yaml
@@ -44,8 +44,8 @@
     mvn-settings: 'systemmetrics-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: systemmetrics
-    description: 'List of systemmetrics jobs'
-    regex: '^systemmetrics-.*'
-    <<: *releng_view_common
+- project:
+    name: systemmetrics-view
+    views:
+      - project-view
+    project-name: systemmetrics

diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml
index b7f34dcc5db9f4d367f93e6c5539e999e5243331..f3342b2723d1344bef525e3df09d759184ba772e 100644 (file)
--- a/jjb/telemetry/telemetry.yaml
+++ b/jjb/telemetry/telemetry.yaml
@@ -61,8 +61,8 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: telemetry
-    description: 'List of telemetry jobs'
-    regex: '^telemetry-.*'
-    <<: *releng_view_common
+- project:
+    name: telemetry-view
+    views:
+      - project-view
+    project-name: telemetry

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index b347ad8c9fcfa71f248935520dd967889202c7c1..920b4e294b4fcdac55c46534984a2b8755a26a20 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -71,8 +71,8 @@
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: transportpce
-    description: 'List of transportpce jobs'
-    regex: '^transportpce-.*'
-    <<: *releng_view_common
+- project:
+    name: transportpce-view
+    views:
+      - project-view
+    project-name: transportpce

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 9221d23bebe84e310aa25f56a2672ef9fbefb6ca..f16049f8291378991e9ccfe3d00a13d8f758fe25 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -71,8 +71,8 @@
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: tsdr
-    description: 'List of tsdr jobs'
-    regex: '^tsdr-.*'
-    <<: *releng_view_common
+- project:
+    name: tsdr-view
+    views:
+      - project-view
+    project-name: tsdr

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index b271cb3197defcbbfa1c2a61bfe7e8a2df897d1b..59becd5b06097e5cd21c9aea7033a55fa6ca8263 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -55,14 +55,15 @@
     name: ttp-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'
     mvn-settings: 'ttp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: ttp
-    description: 'List of ttp jobs'
-    regex: '^ttp-.*'
-    <<: *releng_view_common
+- project:
+    name: ttp-view
+    views:
+      - project-view
+    project-name: ttp

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 5e5af5b21e15aa52b1f2af59fb1b9b2bfb8c734e..cc769ff41d09d15a04ec4f07f61233b1c9195c09 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -49,14 +49,15 @@
     name: unimgr-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: unimgr
-    description: 'List of unimgr jobs'
-    regex: '^unimgr-.*'
-    <<: *releng_view_common
+- project:
+    name: unimgr-view
+    views:
+      - project-view
+    project-name: unimgr

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 1e31b30a432ce77caed8340d8fe35ca5cb0d1c76..a8fb8b199092a06ec470eae310c2ddbb9d33ec9c 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -58,14 +58,15 @@
     name: usc-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: usc
-    description: 'List of usc jobs'
-    regex: '^usc-.*'
-    <<: *releng_view_common
+- project:
+    name: usc-view
+    views:
+      - project-view
+    project-name: usc

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index edaee783db60d18a4073ddb72a6f2f2185a75be3..8f51afc8a7fde6550f0d30e1108470ee81ad52f5 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -61,8 +61,8 @@
     mvn-settings: 'usecplugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: usecplugin
-    description: 'List of usecplugin jobs'
-    regex: '^usecplugin-.*'
-    <<: *releng_view_common
+- project:
+    name: usecplugin-view
+    views:
+      - project-view
+    project-name: usecplugin

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index cb00554c8289f94db49be1e3cd5e0a25589d6e99..e6b67202efbd4b9f1ac53f6570b85f4cf5de21a3 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -97,8 +97,8 @@
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
 
-- view:
-    name: yangtools
-    description: 'List of yangtools jobs'
-    regex: '^yangtools-.*'
-    <<: *releng_view_common
+- project:
+    name: yangtools-view
+    views:
+      - project-view
+    project-name: yangtools