diff --git a/jenkins_jobs/modules/parameters.py b/jenkins_jobs/modules/parameters.py index f1eeaa212..2e120a409 100644 --- a/jenkins_jobs/modules/parameters.py +++ b/jenkins_jobs/modules/parameters.py @@ -479,10 +479,16 @@ def svn_tags_param(registry, xml_parent, data): `. :arg str name: the name of the parameter - :arg str default: the default value of the parameter (optional) - :arg str description: a description of the parameter (optional) :arg str url: the url to list tags from - :arg str filter: the regular expression to filter tags + :arg str credentials-id: Credentials ID to use for authentication + (default '') + :arg str filter: the regular expression to filter tags (default '') + :arg str default: the default value of the parameter (default '') + :arg str description: a description of the parameter (default '') + :arg int max-tags: the number of tags to display (default '100') + :arg bool sort-newest-first: sort tags from newest to oldest (default true) + :arg bool sort-z-to-a: sort tags in reverse alphabetical order + (default false) Example:: @@ -499,10 +505,11 @@ def svn_tags_param(registry, xml_parent, data): 'ListSubversionTagsParameterDefinition') mapping = [ ('url', 'tagsDir', None), - ('filter', 'tagsFilter', None), - ('', 'reverseByDate', "true"), - ('', 'reverseByName', "false"), - ('', 'maxTags', "100"), + ('credentials-id', 'credentialsId', ''), + ('filter', 'tagsFilter', ''), + ('max-tags', 'maxTags', '100'), + ('sort-newest-first', 'reverseByDate', True), + ('sort-z-to-a', 'reverseByName', False), ('', 'uuid', "1-1-1-1-1"), ] convert_mapping_to_xml(pdef, data, mapping, fail_required=True) diff --git a/tests/parameters/fixtures/svn-tags-full.xml b/tests/parameters/fixtures/svn-tags-full.xml new file mode 100644 index 000000000..0c28cecd7 --- /dev/null +++ b/tests/parameters/fixtures/svn-tags-full.xml @@ -0,0 +1,21 @@ + + + + + + + BRANCH_NAME + svn-tags configuration + default-value + /path/to/svn + svn-cred + v[0-9]+ + 25 + false + true + 1-1-1-1-1 + + + + + diff --git a/tests/parameters/fixtures/svn-tags-full.yaml b/tests/parameters/fixtures/svn-tags-full.yaml new file mode 100644 index 000000000..5929bffbd --- /dev/null +++ b/tests/parameters/fixtures/svn-tags-full.yaml @@ -0,0 +1,11 @@ +parameters: + - svn-tags: + name: BRANCH_NAME + url: '/path/to/svn' + credentials-id: svn-cred + filter: 'v[0-9]+' + default: default-value + description: svn-tags configuration + max-tags: 25 + sort-newest-first: False + sort-z-to-a: True diff --git a/tests/parameters/fixtures/svn-tags-minimal.xml b/tests/parameters/fixtures/svn-tags-minimal.xml new file mode 100644 index 000000000..3011f3314 --- /dev/null +++ b/tests/parameters/fixtures/svn-tags-minimal.xml @@ -0,0 +1,21 @@ + + + + + + + BRANCH_NAME + + + /path/to/svn + + + 100 + true + false + 1-1-1-1-1 + + + + + diff --git a/tests/parameters/fixtures/svn-tags-minimal.yaml b/tests/parameters/fixtures/svn-tags-minimal.yaml new file mode 100644 index 000000000..0bfc83bf2 --- /dev/null +++ b/tests/parameters/fixtures/svn-tags-minimal.yaml @@ -0,0 +1,4 @@ +parameters: + - svn-tags: + name: BRANCH_NAME + url: '/path/to/svn'