zuul/nodepool
Code Issues Proposed changes

Fix inheritance of delete-after-upload option

Browse Source 
This diskimage option was not correctly inherited when using
a parent diskimage.

Change-Id: If48c218a0b8b9432e54a55bd947b04016db78479
This commit is contained in:
James E. Blair 2024-03-28 09:19:15 -07:00
parent 75ebae3162
commit d6b13dd47f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodepool/config.py
View File

@ -348,7 +348,9 @@ class DiskImage(ConfigValue):
keep_image_types = config.get('keep-formats', None) keep_image_types = config.get('keep-formats', None)
if keep_image_types: if keep_image_types:
self.keep_image_types = set(keep_image_types) self.keep_image_types = set(keep_image_types)
self.delete_after_upload = config.get('delete-after-upload', False) delete_after_upload = config.get('delete-after-upload', None)
if delete_after_upload is not None:
self.delete_after_upload = delete_after_upload
pause = config.get('pause', None) pause = config.get('pause', None)
if pause: if pause:
self.pause = pause self.pause = pause

4
nodepool/tests/fixtures/node_diskimage_cleanup_formats.yaml vendored
View File

@ -61,10 +61,12 @@ providers:
min-ram: 8192 min-ram: 8192
diskimages: diskimages:
- name: fake-image - name: parent
delete-after-upload: true delete-after-upload: true
keep-formats: keep-formats:
- qcow2 - qcow2
- name: fake-image
parent: parent
elements: elements:
- fedora - fedora
- vm - vm