diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 43766ee3..f4e9414c 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -637,12 +637,12 @@ sub target_install_packages_nonfree_nonconcurrent ($@) { my ($ho, @packages) = @_; my $slist= '/etc/apt/sources.list'; my $xsuites= 'contrib non-free'; - target_cmd_root($ho, <<END, 30); + target_cmd_root($ho, <<END, 300); perl -i~ -pe 'next unless m/^deb/; s{ main\$}{\$& $xsuites};' $slist apt-get update END target_run_pkgmanager_install($ho,\@packages); - target_cmd_root($ho, <<END, 30); + target_cmd_root($ho, <<END, 300); mv $slist~ $slist apt-get update END
Empirically some of these operations can take longer than 30s, especially with a cold cache. Note that because of host sharing and our on-host apt lock, the timeout needs to be the same for every apt operation: a fast operation could be blocked behind a slow one. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> --- Osstest/TestSupport.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)