Archlinux-Jerry/buildbot
1
0
Fork 0
mirror of https://github.com/archlinux-jerry/buildbot synced 2024-11-22 13:00:40 +08:00
Code Issues Releases Wiki Activity

longer timeout for fine machines

Browse source
This commit is contained in:
JerryXiao 2019-11-09 21:02:40 +08:00
parent 09f037c0eb
commit 02cc370e41
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
buildbot.py
View file

@ -444,7 +444,7 @@ class updateManager:
def __get_package_list(self, dirname, arch): def __get_package_list(self, dirname, arch):
pkgdir = REPO_ROOT / dirname pkgdir = REPO_ROOT / dirname
assert pkgdir.exists() assert pkgdir.exists()
pkglist = nspawn_shell(arch, MAKEPKG_PKGLIST_CMD, cwd=pkgdir) pkglist = nspawn_shell(arch, MAKEPKG_PKGLIST_CMD, cwd=pkgdir, RUN_CMD_TIMEOUT=5*60)
pkglist = pkglist.split('\n') pkglist = pkglist.split('\n')
pkglist = [line for line in pkglist if not line.startswith('+')] pkglist = [line for line in pkglist if not line.startswith('+')]
return pkglist return pkglist
@ -479,7 +479,7 @@ class updateManager:
for scr in getattr(pkg, 'update', list()): for scr in getattr(pkg, 'update', list()):
if type(scr) is str: if type(scr) is str:
mon_nspawn_shell(arch, scr, cwd=pkgdir, seconds=60*60) mon_nspawn_shell(arch, scr, cwd=pkgdir, seconds=60*60)
mon_nspawn_shell(arch, MAKEPKG_UPD_CMD, cwd=pkgdir, seconds=60*60, mon_nspawn_shell(arch, MAKEPKG_UPD_CMD, cwd=pkgdir, seconds=5*60*60,
logfile = pkgdir / PKG_UPDATE_LOGFILE, logfile = pkgdir / PKG_UPDATE_LOGFILE,
short_return = True) short_return = True)
if pkg.type in ('git', 'manual'): if pkg.type in ('git', 'manual'):