From 06063a68e9a9c1cb4cea60444db86ad17b461c6e Mon Sep 17 00:00:00 2001
From: Anil Belur <abelur@linuxfoundation.org>
Date: Fri, 26 Oct 2018 15:08:43 +1000
Subject: [PATCH] Move required params to defaults section in views

JIRA: RELENG-1393
Change-Id: I03b7244650f30daebba246f5af7af350309079ce
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---
 .jjb-test/defaults.yaml |  3 ---
 docs/jjb/lf-views.rst   | 26 ++++++++++++++++----------
 jjb/lf-views.yaml       | 16 ++++++++++++++++
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/.jjb-test/defaults.yaml b/.jjb-test/defaults.yaml
index e7893e03..75b5061a 100644
--- a/.jjb-test/defaults.yaml
+++ b/.jjb-test/defaults.yaml
@@ -30,6 +30,3 @@
 
     view-regex: '{project-name}-.*'
     view-description: 'List of {project-name} jobs'
-    view-filter-executors: false
-    view-filter-queue: false
-    view-recurse: false
diff --git a/docs/jjb/lf-views.rst b/docs/jjb/lf-views.rst
index 013dfbe5..926ba597 100644
--- a/docs/jjb/lf-views.rst
+++ b/docs/jjb/lf-views.rst
@@ -17,6 +17,7 @@ Common view groups jobs related to a project and supports the following
 columns.
 
 :Columns:
+
     - status
     - weather
     - job
@@ -29,6 +30,7 @@ columns.
     - robot-list
 
 :Template Names:
+
     - common-view
     - {project-name}
 
@@ -37,13 +39,14 @@ columns.
     :project-name: The name of the view.
     :view-description: View description. (Generally set to 'List of
         {project-name} jobs' in defaults.yaml)
-    :view-filter-executors: View filter executor. (Generally set to 'false' in
-        defaults.yaml)
-    :view-filter-queue: View filter queue. (Generally set to 'false' in
-        defaults.yaml)
     :view-regex: Regex to match the jobs. (Generally set to '^{project-name}-.*'
         in defaults.yaml)
-    :view-recurse: View recurse. (Generally set to 'false' in defaults.yaml)
+
+:Optional parameters:
+
+    :view-filter-executors: View filter executor. (default: false)
+    :view-filter-queue: View filter queue. (default: false)
+    :view-recurse: View recurse. (default: false)
 
 Integration CSIT view
 ---------------------
@@ -52,6 +55,7 @@ Integration CSIT view provides a view for integration or CSIT jobs.
 The view supports the following set of columns.
 
 :Columns:
+
     - status
     - weather
     - job
@@ -62,6 +66,7 @@ The view supports the following set of columns.
     - robot-list
 
 :Template Names:
+
     - integration-csit-view
     - {project-name}
 
@@ -70,10 +75,11 @@ The view supports the following set of columns.
     :project-name: The name of the view.
     :view-description: View description. (Generally set to 'List of
         {project-name} jobs' in defaults.yaml)
-    :view-filter-executors: View filter executor. (Generally set to 'false' in
-        defaults.yaml)
-    :view-filter-queue: View filter queue. (Generally set to 'false' in
-        defaults.yaml)
     :view-regex: Regex to match the jobs. (Generally set to '^{project-name}-.*'
         in defaults.yaml)
-    :view-recurse: View recurse. (Generally set to 'false' in defaults.yaml)
+
+:Optional parameters:
+
+    :view-filter-executors: View filter executor. (default: false)
+    :view-filter-queue: View filter queue. (default: false)
+    :view-recurse: View recurse. (default: false)
diff --git a/jjb/lf-views.yaml b/jjb/lf-views.yaml
index b09ddba1..b1777af9 100644
--- a/jjb/lf-views.yaml
+++ b/jjb/lf-views.yaml
@@ -7,6 +7,14 @@
     id: 'common-view'
     name: '{project-name}'
 
+    ######################
+    # Default parameters #
+    ######################
+
+    view-filter-executors: false
+    view-filter-queue: false
+    view-recurse: false
+
     ######################
     # view Configuration #
     ######################
@@ -37,6 +45,14 @@
     id: 'integration-csit-view'
     name: '{project-name}'
 
+    ######################
+    # Default parameters #
+    ######################
+
+    view-filter-executors: false
+    view-filter-queue: false
+    view-recurse: false
+
     ######################
     # view Configuration #
     ######################
-- 
2.16.6