diff mbox series

tests/acceptance/ppc_prep_40p: Use cdn.netbsd.org hostname

Message ID 20200211134504.9156-1-philmd@redhat.com
State New
Headers show
Series tests/acceptance/ppc_prep_40p: Use cdn.netbsd.org hostname | expand

Commit Message

Philippe Mathieu-Daudé Feb. 11, 2020, 1:45 p.m. UTC
Use NetBSD content delivery network to get faster downloads.

Suggested-by: Kamil Rytarowski <kamil@netbsd.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/acceptance/ppc_prep_40p.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Wainer dos Santos Moschetta Feb. 13, 2020, 8:24 p.m. UTC | #1
On 2/11/20 11:45 AM, Philippe Mathieu-Daudé wrote:
> Use NetBSD content delivery network to get faster downloads.
>
> Suggested-by: Kamil Rytarowski <kamil@netbsd.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>   tests/acceptance/ppc_prep_40p.py | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)


LGTM.

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>


>
> 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,
Alex Bennée Feb. 28, 2020, 4:10 p.m. UTC | #2
Philippe Mathieu-Daudé <philmd@redhat.com> 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.

>
> Suggested-by: Kamil Rytarowski <kamil@netbsd.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  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 March 10, 2020, 1:41 a.m. UTC | #3
On Fri, Feb 28, 2020 at 04:10:19PM +0000, Alex Bennée wrote:
> 
> Philippe Mathieu-Daudé <philmd@redhat.com> 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 <kamil@netbsd.org>
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > ---
> >  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,
> 
>
Cleber Rosa March 10, 2020, 2:32 a.m. UTC | #4
----- Original Message -----
> From: "David Gibson" <david@gibson.dropbear.id.au>
> To: "Alex Bennée" <alex.bennee@linaro.org>
> Cc: qemu-devel@nongnu.org, "Wainer dos Santos Moschetta" <wainersm@redhat.com>, "Kamil Rytarowski"
> <kamil@netbsd.org>, "Hervé Poussineau" <hpoussin@reactos.org>, "Cleber Rosa" <crosa@redhat.com>,
> qemu-ppc@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>
> Sent: Monday, March 9, 2020 9:41:16 PM
> Subject: Re: [PATCH] tests/acceptance/ppc_prep_40p: Use cdn.netbsd.org hostname
> 
> On Fri, Feb 28, 2020 at 04:10:19PM +0000, Alex Bennée wrote:
> > 
> > Philippe Mathieu-Daudé <philmd@redhat.com> 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.
> 

We have added functionality in the latest Avocado that will let us
easily set a "cancel this test if the ISO has not being previously
downloaded", or "cancel if it fails to be downloaded during the test".

+Willian can explain how it works, and if found to be suitable, and work
on a patch.

-Cleber.

> > > Suggested-by: Kamil Rytarowski <kamil@netbsd.org>
> > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > ---
> > >  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
>
Philippe Mathieu-Daudé March 10, 2020, 8:44 a.m. UTC | #5
On 3/10/20 3:32 AM, Cleber Rosa wrote:
> ----- Original Message -----
>> From: "David Gibson" <david@gibson.dropbear.id.au>
>> To: "Alex Bennée" <alex.bennee@linaro.org>
>> Cc: qemu-devel@nongnu.org, "Wainer dos Santos Moschetta" <wainersm@redhat.com>, "Kamil Rytarowski"
>> <kamil@netbsd.org>, "Hervé Poussineau" <hpoussin@reactos.org>, "Cleber Rosa" <crosa@redhat.com>,
>> qemu-ppc@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>
>> Sent: Monday, March 9, 2020 9:41:16 PM
>> Subject: Re: [PATCH] tests/acceptance/ppc_prep_40p: Use cdn.netbsd.org hostname
>>
>> On Fri, Feb 28, 2020 at 04:10:19PM +0000, Alex Bennée wrote:
>>>
>>> Philippe Mathieu-Daudé <philmd@redhat.com> 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.
>>
> 
> We have added functionality in the latest Avocado that will let us
> easily set a "cancel this test if the ISO has not being previously
> downloaded", or "cancel if it fails to be downloaded during the test".
> 
> +Willian can explain how it works, and if found to be suitable, and work
> on a patch.

I suppose this is the relevant Avocado patch:

'Extends fetch_asset core method to find assets and cancel the test'
https://github.com/avocado-framework/avocado/commit/c345569fd

> 
> -Cleber.
> 
>>>> Suggested-by: Kamil Rytarowski <kamil@netbsd.org>
>>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>> ---
>>>>   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
>>
>
David Gibson March 11, 2020, 4:54 a.m. UTC | #6
On Mon, Mar 09, 2020 at 10:32:34PM -0400, Cleber Rosa wrote:
> 
> 
> ----- Original Message -----
> > From: "David Gibson" <david@gibson.dropbear.id.au>
> > To: "Alex Bennée" <alex.bennee@linaro.org>
> > Cc: qemu-devel@nongnu.org, "Wainer dos Santos Moschetta" <wainersm@redhat.com>, "Kamil Rytarowski"
> > <kamil@netbsd.org>, "Hervé Poussineau" <hpoussin@reactos.org>, "Cleber Rosa" <crosa@redhat.com>,
> > qemu-ppc@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>
> > Sent: Monday, March 9, 2020 9:41:16 PM
> > Subject: Re: [PATCH] tests/acceptance/ppc_prep_40p: Use cdn.netbsd.org hostname
> > 
> > On Fri, Feb 28, 2020 at 04:10:19PM +0000, Alex Bennée wrote:
> > > 
> > > Philippe Mathieu-Daudé <philmd@redhat.com> 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.
> 
> We have added functionality in the latest Avocado that will let us
> easily set a "cancel this test if the ISO has not being previously
> downloaded", or "cancel if it fails to be downloaded during the
> test".

That certainly sounds like an improvement.  I still don't love the
idea that the test results will vary based on something outside of the
tested code, even if a cancel is definitely better than a fail.

> +Willian can explain how it works, and if found to be suitable, and work
> on a patch.

Ok.  That would be good to know - will there be some command to run in
advance to attempt to download all the necessary images?  Would that
run without a timeout - or at least a much longer timeout than the
testcase itself has.
Willian Rampazzo March 11, 2020, 3:59 p.m. UTC | #7
> That certainly sounds like an improvement.  I still don't love the
> idea that the test results will vary based on something outside of the
> tested code, even if a cancel is definitely better than a fail.

During the development of Avocado release 76.0, we have discussed how
to implement a new resolver that gathers requirements listed for a
test and fulfills them before the test starts. The discussion resulted
in blueprint BP002 [1]. We are in the last development week of release
77.0, so the development of this new feature should start during the
next release cycle.

>
> > +Willian can explain how it works, and if found to be suitable, and work
> > on a patch.
>
> Ok.  That would be good to know - will there be some command to run in
> advance to attempt to download all the necessary images?  Would that
> run without a timeout - or at least a much longer timeout than the
> testcase itself has.

In the current release development (77.0), we are adding a feature
that makes it possible to cancel a test if an asset is not available
in the cache. It should be as simple as setting two parameters during
the fetch call, like:

bios_path = self.fetch_asset(bios_url, asset_hash=bios_hash,
find_only=True, cancel_on_missing=True)

Release 77.0 of Avocado is scheduled for the beginning of next week.
As soon as it is available, I can send a patch to bump the Avocado
version for qemu tests and a patch to this test enabling this new
feature.

Since avocado 73.0, it is possible to fetch the assets from a test
without actually running the test. It is a feature that parses the
test code looking for the fetch_asset call and its parameters defined
as variables, at a limited depth. I have tested it on ppc_prep_40p.py,
and it works as expected. This command does not have a timeout for
fetching the assets and is as follows:

avocado assets fetch ppc_prep_40p.py

The upcoming feature to cancel the test when an asset is not available
used in conjunction with the command line fetch should give some
flexibility to people running this test while the resolver is under
development.

[1] https://avocado-framework.readthedocs.io/en/latest/blueprints/BP002.html
David Gibson March 23, 2020, 4:50 a.m. UTC | #8
On Wed, Mar 11, 2020 at 12:59:44PM -0300, Willian Rampazzo wrote:
> > That certainly sounds like an improvement.  I still don't love the
> > idea that the test results will vary based on something outside of the
> > tested code, even if a cancel is definitely better than a fail.
> 
> During the development of Avocado release 76.0, we have discussed how
> to implement a new resolver that gathers requirements listed for a
> test and fulfills them before the test starts. The discussion resulted
> in blueprint BP002 [1]. We are in the last development week of release
> 77.0, so the development of this new feature should start during the
> next release cycle.
> 
> >
> > > +Willian can explain how it works, and if found to be suitable, and work
> > > on a patch.
> >
> > Ok.  That would be good to know - will there be some command to run in
> > advance to attempt to download all the necessary images?  Would that
> > run without a timeout - or at least a much longer timeout than the
> > testcase itself has.
> 
> In the current release development (77.0), we are adding a feature
> that makes it possible to cancel a test if an asset is not available
> in the cache. It should be as simple as setting two parameters during
> the fetch call, like:
> 
> bios_path = self.fetch_asset(bios_url, asset_hash=bios_hash,
> find_only=True, cancel_on_missing=True)
> 
> Release 77.0 of Avocado is scheduled for the beginning of next week.
> As soon as it is available, I can send a patch to bump the Avocado
> version for qemu tests and a patch to this test enabling this new
> feature.
> 
> Since avocado 73.0, it is possible to fetch the assets from a test
> without actually running the test. It is a feature that parses the
> test code looking for the fetch_asset call and its parameters defined
> as variables, at a limited depth. I have tested it on ppc_prep_40p.py,
> and it works as expected. This command does not have a timeout for
> fetching the assets and is as follows:
> 
> avocado assets fetch ppc_prep_40p.py
> 
> The upcoming feature to cancel the test when an asset is not available
> used in conjunction with the command line fetch should give some
> flexibility to people running this test while the resolver is under
> development.

I saw how this worked when I did my last batch of pre-pull tests.  It
was way better than how it used to work (when I had at least a half
dozen that failed or skipped unpredictably depending on how long the
download took).

Great work, thanks!
diff mbox series

Patch

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,