From f4b66dc531c852cabaacdb7443fa07003fc3e03f Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sun, 11 Mar 2018 21:01:37 +1000 Subject: [PATCH] Add support for secured jobs filter Add support for secured jobs filter for views. Change-Id: I8b64d80eb0a6131c188710874c5406a1013e44e6 Signed-off-by: Anil Belur --- jenkins_jobs/modules/view_list.py | 17 ++++++++++++ .../view_list_securedjobs_filter_full.xml | 27 +++++++++++++++++++ .../view_list_securedjobs_filter_full.yaml | 10 +++++++ 3 files changed, 54 insertions(+) create mode 100644 tests/views/fixtures/view_list_securedjobs_filter_full.xml create mode 100644 tests/views/fixtures/view_list_securedjobs_filter_full.yaml diff --git a/jenkins_jobs/modules/view_list.py b/jenkins_jobs/modules/view_list.py index ddfe23c2f..3fa11d580 100644 --- a/jenkins_jobs/modules/view_list.py +++ b/jenkins_jobs/modules/view_list.py @@ -169,6 +169,11 @@ to the :ref:`view_list` definition. * **scm-type** ('str'): Type of SCM. (default hudson.scm.NullSCM) + * **secured-job** (`dict`) + :secured-job: + * **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) @@ -434,6 +439,18 @@ class List(jenkins_jobs.modules.base.Base): convert_mapping_to_xml(st_xml, st_data, mapping, fail_required=True) + if jobfilter == 'secured-job': + sj_xml = XML.SubElement(job_filter_xml, + 'hudson.views.SecuredJobsFilter') + sj_xml.set('plugin', 'view-job-filters') + sj_data = jobfilters.get('secured-job') + mapping = [ + ('match-type', 'includeExcludeTypeString', + 'includeMatched'), + ] + convert_mapping_to_xml(sj_xml, sj_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_securedjobs_filter_full.xml b/tests/views/fixtures/view_list_securedjobs_filter_full.xml new file mode 100644 index 000000000..94c61cde2 --- /dev/null +++ b/tests/views/fixtures/view_list_securedjobs_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_securedjobs_filter_full.yaml b/tests/views/fixtures/view_list_securedjobs_filter_full.yaml new file mode 100644 index 000000000..1a48760c0 --- /dev/null +++ b/tests/views/fixtures/view_list_securedjobs_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: + secured-job: + match-type: includeMatched +recurse: true +status-filter: false