Refactor the common-view and csit-view template

[releng/global-jjb.git] / jjb / lf-views.yaml

diff --git a/jjb/lf-views.yaml b/jjb/lf-views.yaml
index b1777af..a8ff34b 100644 (file)
--- a/jjb/lf-views.yaml
+++ b/jjb/lf-views.yaml
@@ -3,14 +3,29 @@
 # 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: '{project-name}'
+    name: '{view-name}'
 
     ######################
     # Default parameters #
     ######################
 
+    view-description: 'View using common-view template.'
     view-filter-executors: false
     view-filter-queue: false
     view-recurse: false
@@ -20,35 +35,26 @@
     ######################
 
     view-type: list
+    description: '{view-description}'
     filter-executors: '{view-filter-executors}'
     filter-queue: '{view-filter-queue}'
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-      - jacoco
-      - find-bugs
-      - robot-list
     recurse: '{view-recurse}'
     regex: '{view-regex}'
-    description: '{view-description}'
+    <<: *lf_view_common_columns
 
-#############################
-# integration view template #
-#############################
+######################
+# CSIT view template #
+######################
 
 - view-template:
-    id: 'integration-csit-view'
-    name: '{project-name}'
+    id: 'csit-view'
+    name: '{view-name}'
 
     ######################
     # Default parameters #
     ######################
 
+    view-description: 'CSIT jobs.'
     view-filter-executors: false
     view-filter-queue: false
     view-recurse: false
@@ -58,8 +64,11 @@
     ######################
 
     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
@@ -69,6 +78,31 @@
       - 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: '{view-regex}'
-    description: '{view-description}'
+    regex: '^{project-name}-.*'
+    <<: *lf_view_common_columns