From 1aa3f9895cef87aabaae0e29e0d07d89106485c5 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sun, 11 Mar 2018 13:17:15 +1000 Subject: Add support for unclassified job filters Add support for unclassified job filters for views. Change-Id: I64f0464857b4925cd5b5b9714b8ba1bb1f860244 Signed-off-by: Anil Belur --- jenkins_jobs/modules/view_list.py | 17 ++++++++++++++ .../view_list_unclassified_filter_full.xml | 27 ++++++++++++++++++++++ .../view_list_unclassified_filter_full.yaml | 10 ++++++++ 3 files changed, 54 insertions(+) create mode 100644 tests/views/fixtures/view_list_unclassified_filter_full.xml create mode 100644 tests/views/fixtures/view_list_unclassified_filter_full.yaml diff --git a/jenkins_jobs/modules/view_list.py b/jenkins_jobs/modules/view_list.py index e9946f95..945fb31b 100644 --- a/jenkins_jobs/modules/view_list.py +++ b/jenkins_jobs/modules/view_list.py @@ -198,6 +198,11 @@ to the :ref:`view_list` definition. * **exclude-originals** ('bool'): Jobs that are originals. (default False) + * **unclassified** (`dict`) + :unclassified: + * **match-type** ('str'): Jobs that match a filter to include. + (default includeMatched) + * **columns** (`list`): List of columns to be shown in view. * **regex** (`str`): . Regular expression for selecting jobs (optional) @@ -507,6 +512,18 @@ class List(jenkins_jobs.modules.base.Base): convert_mapping_to_xml(up_xml, up_data, mapping, fail_required=True) + if jobfilter == 'unclassified': + uc_xml = XML.SubElement(job_filter_xml, + 'hudson.views.UnclassifiedJobsFilter') + uc_xml.set('plugin', 'view-job-filters') + uc_data = jobfilters.get('unclassified') + mapping = [ + ('match-type', 'includeExcludeTypeString', + 'includeMatched'), + ] + convert_mapping_to_xml(uc_xml, uc_data, mapping, + fail_required=True) + c_xml = XML.SubElement(root, 'columns') columns = data.get('columns', DEFAULT_COLUMNS) diff --git a/tests/views/fixtures/view_list_unclassified_filter_full.xml b/tests/views/fixtures/view_list_unclassified_filter_full.xml new file mode 100644 index 00000000..2dbb3eb0 --- /dev/null +++ b/tests/views/fixtures/view_list_unclassified_filter_full.xml @@ -0,0 +1,27 @@ + + + list-view-name01 + Sample description + true + true + + + + + + + includeMatched + + + + + + + + + + + + true + false + diff --git a/tests/views/fixtures/view_list_unclassified_filter_full.yaml b/tests/views/fixtures/view_list_unclassified_filter_full.yaml new file mode 100644 index 00000000..492ad140 --- /dev/null +++ b/tests/views/fixtures/view_list_unclassified_filter_full.yaml @@ -0,0 +1,10 @@ +name: list-view-name01 +view-type: list +description: 'Sample description' +filter-executors: true +filter-queue: true +job-filters: + unclassified: + match-type: includeMatched +recurse: true +status-filter: false -- cgit