jjb/jenkins-job-builder
Code Issues Proposed changes

Add sandbox option to dsl builder

Browse Source 
Job DSL plugin supports execution of its groovy DSL code
via sandbox, but until now there was missing option to control it.

Change-Id: I8dccfc608cf59ac46ded712dc937983a22b9d3b3
This commit is contained in:
Pavel Sedlák 2022-10-21 00:16:59 +02:00
parent a191e0b174
commit c12f334ac7
5 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins_jobs/modules/builders.py
View File

@ -2976,6 +2976,7 @@ def dsl(registry, xml_parent, data):
:arg str additional-classpath: Newline separated list of additional :arg str additional-classpath: Newline separated list of additional
classpath entries for the Job DSL scripts. All entries must be classpath entries for the Job DSL scripts. All entries must be
relative to the workspace root, e.g. build/classes/main. (optional) relative to the workspace root, e.g. build/classes/main. (optional)
:arg bool sandbox: Execute script inside of groovy sandbox (default false)
Example: Example:
@ -3012,6 +3013,8 @@ def dsl(registry, xml_parent, data):
else: else:
raise MissingAttributeError(["script-text", "target"]) raise MissingAttributeError(["script-text", "target"])
XML.SubElement(dsl, "sandbox").text = str(data.get("sandbox", "false")).lower()
XML.SubElement(dsl, "ignoreExisting").text = str( XML.SubElement(dsl, "ignoreExisting").text = str(
data.get("ignore-existing", False) data.get("ignore-existing", False)
).lower() ).lower()

1
tests/builders/fixtures/dsl-002.xml
View File

@ -4,6 +4,7 @@
<javaposse.jobdsl.plugin.ExecuteDslScripts> <javaposse.jobdsl.plugin.ExecuteDslScripts>
<targets>jobs/*/*/*.groovy</targets> <targets>jobs/*/*/*.groovy</targets>
<usingScriptText>false</usingScriptText> <usingScriptText>false</usingScriptText>
<sandbox>false</sandbox>
<ignoreExisting>true</ignoreExisting> <ignoreExisting>true</ignoreExisting>
<removedJobAction>IGNORE</removedJobAction> <removedJobAction>IGNORE</removedJobAction>
<removedViewAction>IGNORE</removedViewAction> <removedViewAction>IGNORE</removedViewAction>

1
tests/builders/fixtures/dsl001.xml
View File

@ -4,6 +4,7 @@
<javaposse.jobdsl.plugin.ExecuteDslScripts> <javaposse.jobdsl.plugin.ExecuteDslScripts>
<scriptText>job { name 'dsljob' }</scriptText> <scriptText>job { name 'dsljob' }</scriptText>
<usingScriptText>true</usingScriptText> <usingScriptText>true</usingScriptText>
<sandbox>true</sandbox>
<ignoreExisting>true</ignoreExisting> <ignoreExisting>true</ignoreExisting>
<removedJobAction>DISABLE</removedJobAction> <removedJobAction>DISABLE</removedJobAction>
<removedViewAction>DELETE</removedViewAction> <removedViewAction>DELETE</removedViewAction>

1
tests/builders/fixtures/dsl001.yaml
View File

@ -6,3 +6,4 @@ builders:
removed-view-action: "DELETE" removed-view-action: "DELETE"
lookup-strategy: "SEED_JOB" lookup-strategy: "SEED_JOB"
additional-classpath: "*.jar" additional-classpath: "*.jar"
sandbox: "true"

1
tests/builders/fixtures/dsl002.xml
View File

@ -4,6 +4,7 @@
<javaposse.jobdsl.plugin.ExecuteDslScripts> <javaposse.jobdsl.plugin.ExecuteDslScripts>
<targets>jobs/**/*.groovy</targets> <targets>jobs/**/*.groovy</targets>
<usingScriptText>false</usingScriptText> <usingScriptText>false</usingScriptText>
<sandbox>false</sandbox>
<ignoreExisting>true</ignoreExisting> <ignoreExisting>true</ignoreExisting>
<removedJobAction>DISABLE</removedJobAction> <removedJobAction>DISABLE</removedJobAction>
<removedViewAction>DELETE</removedViewAction> <removedViewAction>DELETE</removedViewAction>