diff mbox series

[PATCH-for-5.0,3/8] tests/acceptance/ppc_prep_40p: Use mirror for ftp.software.ibm.com

Message ID 20200403172919.24621-4-philmd@redhat.com
State New
Headers show
Series Acceptance tests queue | expand

Commit Message

Philippe Mathieu-Daudé April 3, 2020, 5:29 p.m. UTC
To avoid regular failures on Travis-CI with ftp.software.ibm.com,
use a mirror.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/acceptance/ppc_prep_40p.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Wainer dos Santos Moschetta April 6, 2020, 1:54 p.m. UTC | #1
On 4/3/20 2:29 PM, Philippe Mathieu-Daudé wrote:
> To avoid regular failures on Travis-CI with ftp.software.ibm.com,
> use a mirror.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>   tests/acceptance/ppc_prep_40p.py | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_40p.py
> index 138064285a..1515561249 100644
> --- a/tests/acceptance/ppc_prep_40p.py
> +++ b/tests/acceptance/ppc_prep_40p.py
> @@ -30,7 +30,8 @@ def test_factory_firmware_and_netbsd(self):
>           :avocado: tags=machine:40p
>           :avocado: tags=slowness:high
>           """
> -        bios_url = ('ftp://ftp.boulder.ibm.com/rs6000/firmware/'
> +        bios_url = ('http://ftpmirror.your.org/pub/misc/'
> +                    'ftp.software.ibm.com/rs6000/firmware/'
>                       '7020-40p/P12H0456.IMG')

I checked the bios file can be downloaded from the mirror. I cannot 
judge the mirror is more reliable than ftp.boulder.ibm.com or not, though.

Code-wise, looks good. So:

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

>           bios_hash = '1775face4e6dc27f3a6ed955ef6eb331bf817f03'
>           bios_path = self.fetch_asset(bios_url, asset_hash=bios_hash)
Willian Rampazzo April 6, 2020, 2:07 p.m. UTC | #2
On Mon, Apr 6, 2020 at 10:55 AM Wainer dos Santos Moschetta
<wainersm@redhat.com> wrote:
>
>
> On 4/3/20 2:29 PM, Philippe Mathieu-Daudé wrote:
> > To avoid regular failures on Travis-CI with ftp.software.ibm.com,
> > use a mirror.
> >
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > ---
> >   tests/acceptance/ppc_prep_40p.py | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_40p.py
> > index 138064285a..1515561249 100644
> > --- a/tests/acceptance/ppc_prep_40p.py
> > +++ b/tests/acceptance/ppc_prep_40p.py
> > @@ -30,7 +30,8 @@ def test_factory_firmware_and_netbsd(self):
> >           :avocado: tags=machine:40p
> >           :avocado: tags=slowness:high
> >           """
> > -        bios_url = ('ftp://ftp.boulder.ibm.com/rs6000/firmware/'
> > +        bios_url = ('http://ftpmirror.your.org/pub/misc/'
> > +                    'ftp.software.ibm.com/rs6000/firmware/'
> >                       '7020-40p/P12H0456.IMG')
>
> I checked the bios file can be downloaded from the mirror. I cannot
> judge the mirror is more reliable than ftp.boulder.ibm.com or not, though.
>

During the tests I did to debug Avocado I constantly got a timeout on
FTP. The HTTP URL seems to be more reliable. So far,

Tested-by: Willian Rampazzo <willianr@gmail.com>
Reviewed-by: Willian Rampazzo <willianr@gmail.com>

> Code-wise, looks good. So:
>
> Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
>
> >           bios_hash = '1775face4e6dc27f3a6ed955ef6eb331bf817f03'
> >           bios_path = self.fetch_asset(bios_url, asset_hash=bios_hash)
>
diff mbox series

Patch

diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_40p.py
index 138064285a..1515561249 100644
--- a/tests/acceptance/ppc_prep_40p.py
+++ b/tests/acceptance/ppc_prep_40p.py
@@ -30,7 +30,8 @@  def test_factory_firmware_and_netbsd(self):
         :avocado: tags=machine:40p
         :avocado: tags=slowness:high
         """
-        bios_url = ('ftp://ftp.boulder.ibm.com/rs6000/firmware/'
+        bios_url = ('http://ftpmirror.your.org/pub/misc/'
+                    'ftp.software.ibm.com/rs6000/firmware/'
                     '7020-40p/P12H0456.IMG')
         bios_hash = '1775face4e6dc27f3a6ed955ef6eb331bf817f03'
         bios_path = self.fetch_asset(bios_url, asset_hash=bios_hash)