-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
El Wed, 6 Mar 2013 22:21:41 +0100
Dan Horák <d...@danny.cz> escribió:
> ---
> builder/kojid | 5 +++--
> builder/kojid.conf | 3 +++
> koji/__init__.py | 2 +-
> 3 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/builder/kojid b/builder/kojid
> index f906d0b..18c1fa4 100755
> --- a/builder/kojid
> +++ b/builder/kojid
> @@ -204,7 +204,7 @@ class BuildRoot(object):
> for k in ('repoid', 'tag_name'):
> if hasattr(self, k):
> opts[k] = getattr(self, k)
> - for k in ('mockdir', 'topdir', 'topurl', 'topurls',
> 'packager', 'vendor', 'distribution', 'mockhost', 'yum_proxy'):
> + for k in ('mockdir', 'topdir', 'topurl', 'topurls',
> 'packager', 'vendor', 'distribution', 'mockhost', 'yum_proxy',
> 'rpmbuild_timeout'): if hasattr(self.options, k): opts[k] =
> getattr(self.options, k) opts['buildroot_id'] = self.id
> @@ -3060,6 +3060,7 @@ def get_options():
> 'maven_repo_ignore': '*.md5 *.sha1
> maven-metadata*.xml _maven.repositories ' 'resolver-status.properties
> *.lastUpdated', 'failed_buildroot_lifetime' : 3600 * 4,
> + 'rpmbuild_timeout' : 3600 * 24,
> 'cert': '/etc/kojid/client.crt',
> 'ca': '/etc/kojid/clientca.crt',
> 'serverca': '/etc/kojid/serverca.crt'}
> @@ -3067,7 +3068,7 @@ def get_options():
> for name, value in config.items('kojid'):
> if name in ['sleeptime', 'maxjobs', 'minspace',
> 'retry_interval', 'max_retries', 'offline_retry_interval',
> 'failed_buildroot_lifetime',
> - 'timeout',]:
> + 'timeout', 'rpmbuild_timeout',]:
> try:
> defaults[name] = int(value)
> except ValueError:
> diff --git a/builder/kojid.conf b/builder/kojid.conf
> index 1fa9ad4..05fe3b0 100644
> --- a/builder/kojid.conf
> +++ b/builder/kojid.conf
> @@ -32,6 +32,9 @@
> ; The _host string to use in mock
> ; mockhost=koji-linux-gnu
>
> +; Timeout for build duration (24 hours)
> +; rpmbuild_timeout=86400
> +
> ; The URL for the xmlrpc server
> server=http://hub.example.com/kojihub
>
> diff --git a/koji/__init__.py b/koji/__init__.py
> index f42226b..8ab81a8 100644
> --- a/koji/__init__.py
> +++ b/koji/__init__.py
> @@ -1266,7 +1266,7 @@ def genMockConfig(name, arch, managed=False,
> repoid=None, tag_name=None, **opts) # don't encourage network access
> from the chroot 'use_host_resolv': opts.get('use_host_resolv', False),
> # Don't let a build last more than 24 hours
> - 'rpmbuild_timeout': 86400
> + 'rpmbuild_timeout': opts.get('rpmbuild_timeout', 86400)
> }
>
> # bind_opts are used to mount parts (or all of) /dev if needed.
Applied thanks
Dennis
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAEBAgAGBQJSpgPlAAoJEH7ltONmPFDR8AIQAL1ID5PSv0ettHP1OPvDmQfb
QhQ7eojmCtft2Mxdx5e6mbgIM2nAYuG1aUNsUnH1xHCDOhPdYXcH/Robyq5CEqBY
KRHTmj9NvKHBE8SduhAw6ic5IzWmNzi8GFS4jqC53FGtk625EJtWrKx5GUTXAa3h
jiRIYlyvaisFunY7vJByPKj9Wzpmsgjocdc5D35fDY5xUIBilOrQ+i5cxqyDGGPd
shFRQ4JoaF+aACrmapJzdilVuLQyMKLy+USkNTqwQGSaBy1lwih6K8TC0BB2kT3D
QdRDu4+h46xdA6aWlPN4gv9r2Z0vjJdfsX1cil0TtbjywBaPUczb2TBH9MGILvXZ
wSkZz1l2z7J3ppOwxjeJRAnmUV+pcx8D0q8JxGZH50tX3ol8jqCBLbyncP+XapL6
coeXNJnUJSNgcvv1sCxp6Y+PZV2W/EPNpcquTLE8nRK1zePPUcw3vxMU3b12aSUB
o0D1C0wS22oI/H50mcgGwRbzs4mxNWXhc3IYMCRqVXrhgf4Z7Dxp6HTjbeIfPrHB
rQf8ni7BILUN5sh8fx4K1/d5dEEiHzQ/jRGVvXxdqBnMc688103Z/Xbu3dl0Ekp1
xRGk6av+SSpoajZ6TduAlzcqiqgIgWHhy8MlJ0pK4vEeaJ4bjYkE3NO1cGqu4Tlu
UVeQCC/TyOI6Jnk5DOu9
=IJC2
-----END PGP SIGNATURE-----
--
buildsys mailing list
buildsys@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/buildsys
