mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-23 05:26:16 +01:00
Code

- support --vm-telnet option for KVM builds

Browse Source 
latest build package is required.
This commit is contained in:
Adrian Schröter 2015-11-25 14:20:55 +01:00
parent df95784e07
commit 25118ceccc
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,6 +1,7 @@
0.153 0.153
- "my sr" is using the server side request collection to get right results - "my sr" is using the server side request collection to get right results
- maintenance request offers to supersede old, but still open requests - maintenance request offers to supersede old, but still open requests
- add build --vm-telnet option for getting debug shell in KVM builds
OBS 2.7 only: OBS 2.7 only:
- add "addchannels" and "enablechannel" commands - add "addchannels" and "enablechannel" commands
- support new package instances on branching when using -N parameter - support new package instances on branching when using -N parameter

7
osc/build.py
View File

@ -424,6 +424,7 @@ def main(apiurl, opts, argv):
cache_dir = None cache_dir = None
build_uid = '' build_uid = ''
vm_type = config['build-type'] vm_type = config['build-type']
vm_telnet = None
build_descr = os.path.abspath(build_descr) build_descr = os.path.abspath(build_descr)
build_type = os.path.splitext(build_descr)[1][1:] build_type = os.path.splitext(build_descr)[1][1:]
@ -502,6 +503,8 @@ def main(apiurl, opts, argv):
return 1 return 1
if opts.vm_type: if opts.vm_type:
vm_type = opts.vm_type vm_type = opts.vm_type
if opts.vm_telnet:
vm_telnet = opts.vm_telnet
if opts.alternative_project: if opts.alternative_project:
prj = opts.alternative_project prj = opts.alternative_project
pac = '_repository' pac = '_repository'
@ -1013,6 +1016,10 @@ def main(apiurl, opts, argv):
my_build_swap = build_root + '/swap' my_build_swap = build_root + '/swap'
vm_options = [ '--vm-type=%s' % vm_type ] vm_options = [ '--vm-type=%s' % vm_type ]
if vm_telnet:
vm_options += [ '--vm-telnet=' + vm_telnet ]
if config['build-memory']:
vm_options += [ '--memory=' + config['build-memory'] ]
if vm_type != 'lxc': if vm_type != 'lxc':
vm_options += [ '--vm-disk=' + my_build_device ] vm_options += [ '--vm-disk=' + my_build_device ]
vm_options += [ '--vm-swap=' + my_build_swap ] vm_options += [ '--vm-swap=' + my_build_swap ]

2
osc/commandline.py
View File

@ -5761,6 +5761,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
help='use hard links instead of a deep copied source') help='use hard links instead of a deep copied source')
@cmdln.option('--vm-type', metavar='TYPE', @cmdln.option('--vm-type', metavar='TYPE',
help='use VM type TYPE (e.g. kvm)') help='use VM type TYPE (e.g. kvm)')
@cmdln.option('--vm-telnet', metavar='TELNET',
help='Launch a telnet server inside of VM build')
@cmdln.option('--target', metavar='TARGET', @cmdln.option('--target', metavar='TARGET',
help='define target platform') help='define target platform')
@cmdln.option('--alternative-project', metavar='PROJECT', @cmdln.option('--alternative-project', metavar='PROJECT',