jjb/jenkins-job-builder
Code Issues Proposed changes

Add support of "disableDeferredWipeout" option to workspace cleanup plugin

Browse Source 
Change-Id: I2edd0343966e1720161c291b811b989f005495fb
This commit is contained in:
Sergii Kipot 2019-08-14 20:32:27 +02:00
parent cbc6819978
commit 38aa498df3
8 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins_jobs/modules/publishers.py
View File

@ -3521,6 +3521,8 @@ def workspace_cleanup(registry, xml_parent, data):
:arg bool clean-parent: Cleanup matrix parent workspace (default false)
:arg str external-deletion-command: external deletion command to run
against files and directories
:arg bool disable-deferred-wipeout: Disable improved deferred wipeout
method (default false)
Minimal Example:
@ -3554,7 +3556,8 @@ def workspace_cleanup(registry, xml_parent, data):
mappings = [
('dirmatch', 'deleteDirs', False),
('clean-parent', 'cleanupMatrixParent', False),
('external-deletion-command', 'externalDelete', '')
('external-deletion-command', 'externalDelete', ''),
('disable-deferred-wipeout', 'disableDeferredWipeout', False),
]
helpers.convert_mapping_to_xml(p, data, mappings, fail_required=True)

3
jenkins_jobs/modules/wrappers.py
View File

@ -767,6 +767,8 @@ def workspace_cleanup(registry, xml_parent, data):
determine whether to actually clean up
:arg str external-deletion-command: external deletion command to run
against files and directories
:arg bool disable-deferred-wipeout: Disable improved deferred wipeout
method (default false)
Full Example:
@ -808,6 +810,7 @@ def workspace_cleanup(registry, xml_parent, data):
("dirmatch", 'deleteDirs', False),
('check-parameter', 'cleanupParameter', ''),
('external-deletion-command', 'externalDelete', ''),
('disable-deferred-wipeout', 'disableDeferredWipeout', False),
]
helpers.convert_mapping_to_xml(p, data, mapping, fail_required=True)

1
tests/publishers/fixtures/workspace-cleanup-full.xml
View File

@ -15,6 +15,7 @@
<deleteDirs>true</deleteDirs>
<cleanupMatrixParent>true</cleanupMatrixParent>
<externalDelete>command</externalDelete>
<disableDeferredWipeout>true</disableDeferredWipeout>
<cleanWhenSuccess>false</cleanWhenSuccess>
<cleanWhenUnstable>false</cleanWhenUnstable>
<cleanWhenFailure>false</cleanWhenFailure>

1
tests/publishers/fixtures/workspace-cleanup-full.yaml
View File

@ -14,3 +14,4 @@ publishers:
fail-build: false
clean-parent: true
external-deletion-command: 'command'
disable-deferred-wipeout: true

1
tests/publishers/fixtures/workspace-cleanup-minimal.xml
View File

@ -5,6 +5,7 @@
<deleteDirs>false</deleteDirs>
<cleanupMatrixParent>false</cleanupMatrixParent>
<externalDelete/>
<disableDeferredWipeout>false</disableDeferredWipeout>
<cleanWhenSuccess>true</cleanWhenSuccess>
<cleanWhenUnstable>true</cleanWhenUnstable>
<cleanWhenFailure>true</cleanWhenFailure>

1
tests/wrappers/fixtures/workspace-cleanup-full.xml
View File

@ -15,6 +15,7 @@
<deleteDirs>true</deleteDirs>
<cleanupParameter>DO_WS_CLEANUP</cleanupParameter>
<externalDelete>shred -u %s</externalDelete>
<disableDeferredWipeout>true</disableDeferredWipeout>
</hudson.plugins.ws__cleanup.PreBuildCleanup>
</buildWrappers>
</project>

1
tests/wrappers/fixtures/workspace-cleanup-full.yaml
View File

@ -7,3 +7,4 @@ wrappers:
dirmatch: true
check-parameter: "DO_WS_CLEANUP"
external-deletion-command: "shred -u %s"
disable-deferred-wipeout: true

1
tests/wrappers/fixtures/workspace-cleanup-min.xml
View File

@ -5,6 +5,7 @@
<deleteDirs>false</deleteDirs>
<cleanupParameter/>
<externalDelete/>
<disableDeferredWipeout>false</disableDeferredWipeout>
</hudson.plugins.ws__cleanup.PreBuildCleanup>
</buildWrappers>
</project>