particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change default value of oz_install_timeout to 0

Browse source
This commit is contained in:
Yuming Zhu 2018-05-04 01:25:13 +08:00 • committed by Mike McLean
parent 5e76219bcc
commit 6a91a3ba6b
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
builder/kojid
View file

@ -3563,7 +3563,7 @@ class OzImageTask(BaseTaskHandler):
'imgdir': os.path.join(self.workdir, 'scratch_images'),
'tmpdir': os.path.join(self.workdir, 'oz-tmp'),
'verbose': True,
'timeout': self.options.oz_install_timeout,
'timeout': self.options.oz_install_timeout or None,
'output': 'log',
'raw': False,
'debug': True,
@ -5725,7 +5725,7 @@ def get_options():
'resolver-status.properties *.lastUpdated',
'failed_buildroot_lifetime' : 3600 * 4,
'rpmbuild_timeout' : 3600 * 24,
'oz_install_timeout': None,
'oz_install_timeout': 0,
'cert': None,
'ca': '', # FIXME: Unused, remove in next major release
'serverca': None}

3
builder/kojid.conf
View file

@ -39,7 +39,8 @@
; rpmbuild_timeout=86400
; Install timeout(seconds) for image build
; if it's unset, use the number in /etc/oz/oz.cfg, supported since oz-0.16.0
; Default value is 0, which means using the number in /etc/oz/oz.cfg,
; supported since oz-0.16.0
; oz_install_timeout=7200
; The URL for the xmlrpc server

6
docs/source/image_build.rst
View file

@ -661,9 +661,9 @@ ImageFactory/Oz Preparation
#. VMDKStream => 0.2
#. pykickstart
#. Edit ``/etc/kojid/kojid.conf``, and set an second value, eg: 7200 for
``oz_install_timeout``. It's a timeout waiting guest installing. If it's
not specified, oz will use its default value. Since ``oz-0.16.0`` it can be
configured in ``/etc/oz/oz.cfg`` as ``install`` in the ``[timeouts]``
``oz_install_timeout``. It's a timeout waiting guest installing. Default
value is 0, that means oz will use its default value. Since ``oz-0.16.0``,
it can be configured in ``/etc/oz/oz.cfg`` as ``install`` in ``[timeouts]``
section.
#. Edit ``/etc/oz/oz.cfg``, and set the memory value in the ``[libvirt]``
section to at least 2048. Set ``safe_generation`` under ``[icicle]`` to yes.