Merge "Add groovy-script-file option to extended parameters"

jenkins_jobs/modules/parameters.py

@@ -426,6 +426,8 @@ def extended_choice_param(registry, xml_parent, data):
     :arg str multi-select-delimiter: value between selections when the
         parameter is a multi-select (optional, default ',')
     :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 classpath: the classpath for the groovy script
         (optional, default ',')
     :arg str default-groovy-script: the default groovy
@@ -480,6 +482,7 @@ def extended_choice_param(registry, xml_parent, data):
         ('description-property-file', 'descriptionPropertyFile', ''),
         ('description-property-key', 'descriptionPropertyKey', ''),
         ('groovy-script', 'groovyScript', ''),
+        ('groovy-script-file', 'groovyScriptFile', ''),
         ('classpath', 'groovyClasspath', ''),
         ('default-groovy-script', 'defaultGroovyScript', ''),
         ('default-groovy-classpath', 'defaultGroovyClasspath', ''),

tests/parameters/fixtures/extended-choice-param-full.xml

@@ -20,6 +20,7 @@
           <descriptionPropertyFile/>
           <descriptionPropertyKey/>
           <groovyScript/>
+          <groovyScriptFile/>
           <groovyClasspath/>
           <defaultGroovyScript/>
           <defaultGroovyClasspath/>
@@ -43,6 +44,7 @@
           <descriptionPropertyFile/>
           <descriptionPropertyKey/>
           <groovyScript/>
+          <groovyScriptFile/>
           <groovyClasspath/>
           <defaultGroovyScript/>
           <defaultGroovyClasspath/>
@@ -66,6 +68,7 @@
           <descriptionPropertyFile/>
           <descriptionPropertyKey/>
           <groovyScript/>
+          <groovyScriptFile/>
           <groovyClasspath/>
           <defaultGroovyScript/>
           <defaultGroovyClasspath/>

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

@@ -20,6 +20,7 @@
           <descriptionPropertyFile/>
           <descriptionPropertyKey/>
           <groovyScript>return 'value1, value2, value3'</groovyScript>
+          <groovyScriptFile/>
           <groovyClasspath/>
           <defaultGroovyScript/>
           <defaultGroovyClasspath/>

tests/parameters/fixtures/extended-choice-param-minimal.xml

@@ -20,6 +20,7 @@
           <descriptionPropertyFile/>
           <descriptionPropertyKey/>
           <groovyScript/>
+          <groovyScriptFile/>
           <groovyClasspath/>
           <defaultGroovyScript/>
           <defaultGroovyClasspath/>