jjb
/
jenkins-job-builder
Code Issues Proposed changes

Fix git-parameter sortMode values 

It is impossible now to chose one of the following values of sortMode:
[ASCENDING_SMART, DESCENDING_SMART] because default value in JJB was hardcoded w/o '_',
but jenkins expect value w/ '_'. So if we pass e.g. ACENDING SMART (w/o '_') we get
improperly configured job and sortMode in this way replaced with NONE.
If we pass w/ '_' we got an error on testing JJB definitions.

Please merge ASAP.

Change-Id: I9bc4ff471ddb7d648005832e055ba14d59822489
This commit is contained in:
Vasily Gorin 2017-11-27 14:10:24 +03:00
parent a56e9903a0
commit d77b4d67f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jenkins_jobs/modules/parameters.py
View File

@ -910,8 +910,8 @@ def git_parameter_param(registry, xml_parent, data):
:Allowed Values: * **NONE**
* **DESCENDING**
* **ASCENDING**
* **ASCENDING SMART**
* **DESCENDING SMART**
* **ASCENDING_SMART**
* **DESCENDING_SMART**
:arg str defaultValue: This value is returned when list is empty. (default
'')
@ -958,9 +958,9 @@ def git_parameter_param(registry, xml_parent, data):
valid_sort_modes = [
'NONE',
'ASCENDING',
'ASCENDING SMART',
'ASCENDING_SMART',
'DESCENDING',
'DESCENDING SMART',
'DESCENDING_SMART',
]
valid_selected_values = ['NONE', 'TOP', 'DEFAULT']