jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "adding variable bindings option to extended parameters"

This commit is contained in:
Zuul 2019-04-09 02:09:06 +00:00 committed by Gerrit Code Review
parent 0cf0452d5d fc7864ab7f
commit ec3080b5bc
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins_jobs/modules/parameters.py
View File

@ -430,6 +430,8 @@ def extended_choice_param(registry, xml_parent, data):
:arg str groovy-script: the groovy script contents (optional, default ',')
:arg str groovy-script-file: location of groovy script file to generate
parameters (optional, default '')
:arg str bindings: variable bindings for the groovy script
(optional, default '')
:arg str classpath: the classpath for the groovy script
(optional, default ',')
:arg str default-groovy-script: the default groovy
@ -483,6 +485,7 @@ def extended_choice_param(registry, xml_parent, data):
('default-property-key', 'defaultPropertyKey', ''),
('description-property-file', 'descriptionPropertyFile', ''),
('description-property-key', 'descriptionPropertyKey', ''),
('bindings', 'bindings', ''),
('groovy-script', 'groovyScript', ''),
('groovy-script-file', 'groovyScriptFile', ''),
('classpath', 'groovyClasspath', ''),

3
tests/parameters/fixtures/extended-choice-param-full.xml
View File

@ -19,6 +19,7 @@
<defaultPropertyKey>fookey</defaultPropertyKey>
<descriptionPropertyFile/>
<descriptionPropertyKey/>
<bindings/>
<groovyScript/>
<groovyScriptFile/>
<groovyClasspath/>
@ -43,6 +44,7 @@
<defaultPropertyKey/>
<descriptionPropertyFile/>
<descriptionPropertyKey/>
<bindings/>
<groovyScript/>
<groovyScriptFile/>
<groovyClasspath/>
@ -67,6 +69,7 @@
<defaultPropertyKey/>
<descriptionPropertyFile/>
<descriptionPropertyKey/>
<bindings/>
<groovyScript/>
<groovyScriptFile/>
<groovyClasspath/>

1
tests/parameters/fixtures/extended-choice-param-minimal-groovy.xml
View File

@ -19,6 +19,7 @@
<defaultPropertyKey/>
<descriptionPropertyFile/>
<descriptionPropertyKey/>
<bindings/>
<groovyScript>return 'value1, value2, value3'</groovyScript>
<groovyScriptFile/>
<groovyClasspath/>

1
tests/parameters/fixtures/extended-choice-param-minimal.xml
View File

@ -19,6 +19,7 @@
<defaultPropertyKey/>
<descriptionPropertyFile/>
<descriptionPropertyKey/>
<bindings/>
<groovyScript/>
<groovyScriptFile/>
<groovyClasspath/>