Re: [PATCH] tests/acceptance/ppc_prep_40p: Use cdn.netbsd.org hostname

[David Gibson]

On Fri, Feb 28, 2020 at 04:10:19PM +0000, Alex Bennée wrote:
> 
> Philippe Mathieu-Daudé <address@hidden> writes:
> 
> > Use NetBSD content delivery network to get faster downloads.
> 
> Even with this patch I get failures on my big dev box:
> 
>  (48/67) 
> tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_and_netbsd: 
> INTERRUPTED: Failed to fetch NetBSD-7.1.2-prep.iso.\nRunner error occurred: 
> Timeout reached\nOriginal status: ERROR\n{'name': 
> '48-tests/acceptance/ppc_prep_40p.py:IbmPrep40pMachine.test_openbios_and_netbsd',
>  'logdir': '/home/alex/lsrc/qemu.git/builds/all/tests/results/jo... (60.31 s)
> 
> I think ultimately a whole ISO download is just too much for an
> acceptance test.

I tend to agree.  Here in a network-remote part of the world, these
always seem to cause timeouts and other problems, in a bunch of the
testcases.

Those are testing useful things though, so I'd really like to see the
downloads split out into some sort of preparation step that can be
done just once, rather than part of the test proper.

> > Suggested-by: Kamil Rytarowski <address@hidden>
> > Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> > ---
> >  tests/acceptance/ppc_prep_40p.py | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/tests/acceptance/ppc_prep_40p.py 
> > b/tests/acceptance/ppc_prep_40p.py
> > index efe06037ba..6729d96f5e 100644
> > --- a/tests/acceptance/ppc_prep_40p.py
> > +++ b/tests/acceptance/ppc_prep_40p.py
> > @@ -34,7 +34,7 @@ def test_factory_firmware_and_netbsd(self):
> >                      '7020-40p/P12H0456.IMG')
> >          bios_hash = '1775face4e6dc27f3a6ed955ef6eb331bf817f03'
> >          bios_path = self.fetch_asset(bios_url, asset_hash=bios_hash)
> > -        drive_url = ('https://ftp.netbsd.org/pub/NetBSD/NetBSD-archive/'
> > +        drive_url = ('https://cdn.netbsd.org/pub/NetBSD/NetBSD-archive/'
> >                       'NetBSD-4.0/prep/installation/floppy/generic_com0.fs')
> >          drive_hash = 'dbcfc09912e71bd5f0d82c7c1ee43082fb596ceb'
> >          drive_path = self.fetch_asset(drive_url, asset_hash=drive_hash)
> > @@ -67,7 +67,7 @@ def test_openbios_and_netbsd(self):
> >          :avocado: tags=arch:ppc
> >          :avocado: tags=machine:40p
> >          """
> > -        drive_url = ('https://ftp.netbsd.org/pub/NetBSD/iso/7.1.2/'
> > +        drive_url = ('https://cdn.netbsd.org/pub/NetBSD/iso/7.1.2/'
> >                       'NetBSD-7.1.2-prep.iso')
> >          drive_hash = 'ac6fa2707d888b36d6fa64de6e7fe48e'
> >          drive_path = self.fetch_asset(drive_url, asset_hash=drive_hash,
> 
> 

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature