summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGleb Samsonov <gleb_samsonov@epam.com>2018-09-03 13:11:50 +0300
committerThanh Ha <zxiiro@gmail.com>2019-04-09 09:41:28 +0800
commitfc7864ab7f91e61c38d1320c03a0cac512faa026 (patch)
treeab7309449baef1024ec0fc850964bacf4dd38e4a
parent23079af77770f736ce340eebabfeb4714fa25d89 (diff)
downloadpython-jenkins-job-builder-fc7864ab7f91e61c38d1320c03a0cac512faa026.tar.gz
python-jenkins-job-builder-fc7864ab7f91e61c38d1320c03a0cac512faa026.tar.xz
python-jenkins-job-builder-fc7864ab7f91e61c38d1320c03a0cac512faa026.zip
adding variable bindings option to extended parameters
Change-Id: I4e9fba2da7771d1cac04bcb9818389207a6f301e
-rw-r--r--jenkins_jobs/modules/parameters.py3
-rw-r--r--tests/parameters/fixtures/extended-choice-param-full.xml3
-rw-r--r--tests/parameters/fixtures/extended-choice-param-minimal-groovy.xml1
-rw-r--r--tests/parameters/fixtures/extended-choice-param-minimal.xml1
4 files changed, 8 insertions, 0 deletions
diff --git a/jenkins_jobs/modules/parameters.py b/jenkins_jobs/modules/parameters.py
index 3cd8ff71..acfe0164 100644
--- a/jenkins_jobs/modules/parameters.py
+++ b/jenkins_jobs/modules/parameters.py
@@ -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', ''),
diff --git a/tests/parameters/fixtures/extended-choice-param-full.xml b/tests/parameters/fixtures/extended-choice-param-full.xml
index eae56edc..fd01513d 100644
--- a/tests/parameters/fixtures/extended-choice-param-full.xml
+++ b/tests/parameters/fixtures/extended-choice-param-full.xml
@@ -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/>
diff --git a/tests/parameters/fixtures/extended-choice-param-minimal-groovy.xml b/tests/parameters/fixtures/extended-choice-param-minimal-groovy.xml
index 62719288..29bbeba2 100644
--- a/tests/parameters/fixtures/extended-choice-param-minimal-groovy.xml
+++ b/tests/parameters/fixtures/extended-choice-param-minimal-groovy.xml
@@ -19,6 +19,7 @@
<defaultPropertyKey/>
<descriptionPropertyFile/>
<descriptionPropertyKey/>
+ <bindings/>
<groovyScript>return 'value1, value2, value3'</groovyScript>
<groovyScriptFile/>
<groovyClasspath/>
diff --git a/tests/parameters/fixtures/extended-choice-param-minimal.xml b/tests/parameters/fixtures/extended-choice-param-minimal.xml
index 294f3973..c908a9d2 100644
--- a/tests/parameters/fixtures/extended-choice-param-minimal.xml
+++ b/tests/parameters/fixtures/extended-choice-param-minimal.xml
@@ -19,6 +19,7 @@
<defaultPropertyKey/>
<descriptionPropertyFile/>
<descriptionPropertyKey/>
+ <bindings/>
<groovyScript/>
<groovyScriptFile/>
<groovyClasspath/>