1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-09-20 01:06:17 +02:00

osc build --vm-disk-size= switch support

This commit is contained in:
Adrian Schröter 2019-12-03 15:08:41 +01:00
parent a628ea8cca
commit eb7aab1cf7
3 changed files with 9 additions and 3 deletions

1
NEWS
View File

@ -3,6 +3,7 @@
- osc build --vm-type=qemu support for cross architecture builds
- osc build is reading debug packages from prjconf now
(extra-pkgs definition is therefore by default empty)
- osc build --vm-disk-size= switch support
0.166.2
- Don't enforce password reuse (boo#1156501)

View File

@ -531,6 +531,7 @@ def main(apiurl, opts, argv):
cache_dir = None
build_uid = ''
vm_memory = config['build-memory']
vm_disk_size = config['build-vmdisk-rootsize']
vm_type = config['build-type']
vm_telnet = None
@ -620,6 +621,8 @@ def main(apiurl, opts, argv):
return 1
if opts.vm_memory:
vm_memory = opts.vm_memory
if opts.vm_disk_size:
vm_disk_size = opts.vm_disk_size
if opts.vm_type:
vm_type = opts.vm_type
if opts.vm_telnet:
@ -1225,9 +1228,9 @@ def main(apiurl, opts, argv):
vm_options += [ '--vm-initrd=' + config['build-initrd'] ]
build_root += '/.mount'
if vm_disk_size:
vm_options += [ '--vmdisk-rootsize=' + vm_disk_size ]
if config['build-vmdisk-rootsize']:
vm_options += [ '--vmdisk-rootsize=' + config['build-vmdisk-rootsize'] ]
if config['build-vmdisk-swapsize']:
vm_options += [ '--vmdisk-swapsize=' + config['build-vmdisk-swapsize'] ]
if config['build-vmdisk-filesystem']:

View File

@ -6305,7 +6305,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
@cmdln.option('--linksources', action='store_true',
help='use hard links instead of a deep copied source')
@cmdln.option('--vm-memory', metavar='MEMORY',
help='use given MB for VM')
help='amount of memory for VM defined in MB')
@cmdln.option('--vm-disk-size', metavar='DISKSIZE',
help='size for newly created disk image in MB')
@cmdln.option('--vm-type', metavar='TYPE',
help='use VM type TYPE (e.g. kvm)')
@cmdln.option('--vm-telnet', metavar='TELNET',