[PATCH v2 3/7] tests/avocado: drop BootLinuxConsole.test_mips_malta_cpio test

Alex Bennée posted 7 patches 12 months ago
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Cleber Rosa <crosa@redhat.com>, Radoslaw Biernacki <rad@semihalf.com>, Peter Maydell <peter.maydell@linaro.org>, Leif Lindholm <quic_llindhol@quicinc.com>, Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>, "Cédric Le Goater" <clg@kaod.org>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>, Aurelien Jarno <aurelien@aurel32.net>, Yoshinori Sato <ysato@users.sourceforge.jp>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>, Paolo Bonzini <pbonzini@redhat.com>, Eric Auger <eric.auger@redhat.com>
[PATCH v2 3/7] tests/avocado: drop BootLinuxConsole.test_mips_malta_cpio test
Posted by Alex Bennée 12 months ago
The assets are no longer archived by Debian so we can't run this on
CI. While some people may still have the test in their cache we do
have more recent images from tuxrun so this isn't a great loss.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 tests/avocado/boot_linux_console.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 231b4f68e5..5d978f6dd0 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -116,28 +116,6 @@ def test_x86_64_pc(self):
         console_pattern = 'Kernel command line: %s' % kernel_command_line
         self.wait_for_console_pattern(console_pattern)
 
-    def test_mips_malta(self):
-        """
-        :avocado: tags=arch:mips
-        :avocado: tags=machine:malta
-        :avocado: tags=endian:big
-        """
-        deb_url = ('http://snapshot.debian.org/archive/debian/'
-                   '20130217T032700Z/pool/main/l/linux-2.6/'
-                   'linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb')
-        deb_hash = 'a8cfc28ad8f45f54811fc6cf74fc43ffcfe0ba04'
-        deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
-        kernel_path = self.extract_from_deb(deb_path,
-                                            '/boot/vmlinux-2.6.32-5-4kc-malta')
-
-        self.vm.set_console()
-        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0'
-        self.vm.add_args('-kernel', kernel_path,
-                         '-append', kernel_command_line)
-        self.vm.launch()
-        console_pattern = 'Kernel command line: %s' % kernel_command_line
-        self.wait_for_console_pattern(console_pattern)
-
     def test_mips64el_malta(self):
         """
         This test requires the ar tool to extract "data.tar.gz" from
-- 
2.39.2


Re: [PATCH v2 3/7] tests/avocado: drop BootLinuxConsole.test_mips_malta_cpio test
Posted by Philippe Mathieu-Daudé 12 months ago
On 1/12/23 10:36, Alex Bennée wrote:
> The assets are no longer archived by Debian so we can't run this on
> CI. While some people may still have the test in their cache we do
> have more recent images from tuxrun so this isn't a great loss.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   tests/avocado/boot_linux_console.py | 22 ----------------------
>   1 file changed, 22 deletions(-)
> 
> diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
> index 231b4f68e5..5d978f6dd0 100644
> --- a/tests/avocado/boot_linux_console.py
> +++ b/tests/avocado/boot_linux_console.py
> @@ -116,28 +116,6 @@ def test_x86_64_pc(self):
>           console_pattern = 'Kernel command line: %s' % kernel_command_line
>           self.wait_for_console_pattern(console_pattern)
>   
> -    def test_mips_malta(self):
> -        """
> -        :avocado: tags=arch:mips
> -        :avocado: tags=machine:malta
> -        :avocado: tags=endian:big
> -        """
> -        deb_url = ('http://snapshot.debian.org/archive/debian/'
> -                   '20130217T032700Z/pool/main/l/linux-2.6/'
> -                   'linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb')

You are dropping test_mips_malta() while the subject says
"test_mips_malta_cpio" which uses:

         deb_url = ('http://snapshot.debian.org/archive/debian/'
                    '20160601T041800Z/pool/main/l/linux/'
                    'linux-image-4.5.0-2-4kc-malta_4.5.5-1_mips.deb')

Anyway, the lesson is we can't rely on Debian snapshot mirror
anymore, so more need to be cleaned:

$ git grep url.*snapshot.debian.org
tests/avocado/boot_linux_console.py:127:        deb_url = 
('http://snapshot.debian.org/archive/debian/'
tests/avocado/boot_linux_console.py:160:        deb_url = 
('http://snapshot.debian.org/archive/debian/'
tests/avocado/boot_linux_console.py:203:        deb_url = 
('http://snapshot.debian.org/archive/debian/'
tests/avocado/boot_linux_console.py:513:        deb_url = 
('https://snapshot.debian.org/archive/debian/'
tests/avocado/boot_linux_console.py:1129:        deb_url = 
('http://snapshot.debian.org/archive/debian/'
tests/avocado/boot_linux_console.py:1255:        deb_url = 
('https://snapshot.debian.org/archive/debian-ports'
tests/avocado/boot_linux_console.py:1299:        deb_url = 
('http://snapshot.debian.org/archive/debian/'
tests/avocado/machine_s390_ccw_virtio.py:50:        kernel_url = 
('https://snapshot.debian.org/archive/debian/'
tests/avocado/machine_s390_ccw_virtio.py:56:        initrd_url = 
('https://snapshot.debian.org/archive/debian/'
tests/avocado/replay_kernel.py:110:        deb_url = 
('http://snapshot.debian.org/archive/debian/'
tests/avocado/replay_kernel.py:139:        deb_url = 
('http://snapshot.debian.org/archive/debian/'
tests/avocado/replay_kernel.py:287:        deb_url = 
('https://snapshot.debian.org/archive/debian-ports'
tests/avocado/replay_kernel.py:445:        deb_url = 
('http://snapshot.debian.org/archive/debian/'

Re: [PATCH v2 3/7] tests/avocado: drop BootLinuxConsole.test_mips_malta_cpio test
Posted by Philippe Mathieu-Daudé 12 months ago
On 1/12/23 14:45, Philippe Mathieu-Daudé wrote:
> On 1/12/23 10:36, Alex Bennée wrote:
>> The assets are no longer archived by Debian so we can't run this on
>> CI. While some people may still have the test in their cache we do
>> have more recent images from tuxrun so this isn't a great loss.
>>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> Cc: Stefan Hajnoczi <stefanha@redhat.com>
>> Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>>   tests/avocado/boot_linux_console.py | 22 ----------------------
>>   1 file changed, 22 deletions(-)
>>
>> diff --git a/tests/avocado/boot_linux_console.py 
>> b/tests/avocado/boot_linux_console.py
>> index 231b4f68e5..5d978f6dd0 100644
>> --- a/tests/avocado/boot_linux_console.py
>> +++ b/tests/avocado/boot_linux_console.py
>> @@ -116,28 +116,6 @@ def test_x86_64_pc(self):
>>           console_pattern = 'Kernel command line: %s' % 
>> kernel_command_line
>>           self.wait_for_console_pattern(console_pattern)
>> -    def test_mips_malta(self):
>> -        """
>> -        :avocado: tags=arch:mips
>> -        :avocado: tags=machine:malta
>> -        :avocado: tags=endian:big
>> -        """
>> -        deb_url = ('http://snapshot.debian.org/archive/debian/'
>> -                   '20130217T032700Z/pool/main/l/linux-2.6/'
>> -                   'linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb')

This link still works for me, what am I missing?

$ wget 
http://snapshot.debian.org/archive/debian/20130217T032700Z/pool/main/l/linux-2.6/linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb
--2023-12-01 14:55:31-- 
http://snapshot.debian.org/archive/debian/20130217T032700Z/pool/main/l/linux-2.6/linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb
Resolving snapshot.debian.org (snapshot.debian.org)... 185.17.185.185, 
193.62.202.27
Connecting to snapshot.debian.org 
(snapshot.debian.org)|185.17.185.185|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 30231730 (29M)
Saving to: ‘linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb’

    linux-image-2.6.32-5-4kc-ma  12%[=>    ]   3,71M  1,23MB/s    eta 20s

> 
> You are dropping test_mips_malta() while the subject says
> "test_mips_malta_cpio" which uses:
> 
>          deb_url = ('http://snapshot.debian.org/archive/debian/'
>                     '20160601T041800Z/pool/main/l/linux/'
>                     'linux-image-4.5.0-2-4kc-malta_4.5.5-1_mips.deb')
> 
> Anyway, the lesson is we can't rely on Debian snapshot mirror
> anymore, so more need to be cleaned:
> 
> $ git grep url.*snapshot.debian.org
> tests/avocado/boot_linux_console.py:127:        deb_url = 
> ('http://snapshot.debian.org/archive/debian/'
> tests/avocado/boot_linux_console.py:160:        deb_url = 
> ('http://snapshot.debian.org/archive/debian/'
> tests/avocado/boot_linux_console.py:203:        deb_url = 
> ('http://snapshot.debian.org/archive/debian/'
> tests/avocado/boot_linux_console.py:513:        deb_url = 
> ('https://snapshot.debian.org/archive/debian/'
> tests/avocado/boot_linux_console.py:1129:        deb_url = 
> ('http://snapshot.debian.org/archive/debian/'
> tests/avocado/boot_linux_console.py:1255:        deb_url = 
> ('https://snapshot.debian.org/archive/debian-ports'
> tests/avocado/boot_linux_console.py:1299:        deb_url = 
> ('http://snapshot.debian.org/archive/debian/'
> tests/avocado/machine_s390_ccw_virtio.py:50:        kernel_url = 
> ('https://snapshot.debian.org/archive/debian/'
> tests/avocado/machine_s390_ccw_virtio.py:56:        initrd_url = 
> ('https://snapshot.debian.org/archive/debian/'
> tests/avocado/replay_kernel.py:110:        deb_url = 
> ('http://snapshot.debian.org/archive/debian/'
> tests/avocado/replay_kernel.py:139:        deb_url = 
> ('http://snapshot.debian.org/archive/debian/'
> tests/avocado/replay_kernel.py:287:        deb_url = 
> ('https://snapshot.debian.org/archive/debian-ports'
> tests/avocado/replay_kernel.py:445:        deb_url = 
> ('http://snapshot.debian.org/archive/debian/'


Re: [PATCH v2 3/7] tests/avocado: drop BootLinuxConsole.test_mips_malta_cpio test
Posted by Alex Bennée 12 months ago
Philippe Mathieu-Daudé <philmd@linaro.org> writes:

> On 1/12/23 14:45, Philippe Mathieu-Daudé wrote:
>> On 1/12/23 10:36, Alex Bennée wrote:
>>> The assets are no longer archived by Debian so we can't run this on
>>> CI. While some people may still have the test in their cache we do
>>> have more recent images from tuxrun so this isn't a great loss.
>>>
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> Cc: Stefan Hajnoczi <stefanha@redhat.com>
>>> Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
>>> ---
>>>   tests/avocado/boot_linux_console.py | 22 ----------------------
>>>   1 file changed, 22 deletions(-)
>>>
>>> diff --git a/tests/avocado/boot_linux_console.py
>>> b/tests/avocado/boot_linux_console.py
>>> index 231b4f68e5..5d978f6dd0 100644
>>> --- a/tests/avocado/boot_linux_console.py
>>> +++ b/tests/avocado/boot_linux_console.py
>>> @@ -116,28 +116,6 @@ def test_x86_64_pc(self):
>>>           console_pattern = 'Kernel command line: %s' %
>>> kernel_command_line
>>>           self.wait_for_console_pattern(console_pattern)
>>> -    def test_mips_malta(self):
>>> -        """
>>> -        :avocado: tags=arch:mips
>>> -        :avocado: tags=machine:malta
>>> -        :avocado: tags=endian:big
>>> -        """
>>> -        deb_url = ('http://snapshot.debian.org/archive/debian/'
>>> -                   '20130217T032700Z/pool/main/l/linux-2.6/'
>>> -                   'linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb')
>
> This link still works for me, what am I missing?
>
> $ wget
> http://snapshot.debian.org/archive/debian/20130217T032700Z/pool/main/l/linux-2.6/linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb
> --2023-12-01 14:55:31--
>   http://snapshot.debian.org/archive/debian/20130217T032700Z/pool/main/l/linux-2.6/linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb
> Resolving snapshot.debian.org (snapshot.debian.org)... 185.17.185.185,
> 193.62.202.27
> Connecting to snapshot.debian.org
> (snapshot.debian.org)|185.17.185.185|:80... connected.
> HTTP request sent, awaiting response... 200 OK
> Length: 30231730 (29M)
> Saving to: ‘linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb’

The failing link is the malta_cpio linux-4.7 one, I've fixed that in the
PR.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro
Re: [PATCH v2 3/7] tests/avocado: drop BootLinuxConsole.test_mips_malta_cpio test
Posted by Philippe Mathieu-Daudé 12 months ago
On 1/12/23 14:57, Philippe Mathieu-Daudé wrote:
> On 1/12/23 14:45, Philippe Mathieu-Daudé wrote:
>> On 1/12/23 10:36, Alex Bennée wrote:
>>> The assets are no longer archived by Debian so we can't run this on
>>> CI. While some people may still have the test in their cache we do
>>> have more recent images from tuxrun so this isn't a great loss.
>>>
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> Cc: Stefan Hajnoczi <stefanha@redhat.com>
>>> Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
>>> ---
>>>   tests/avocado/boot_linux_console.py | 22 ----------------------
>>>   1 file changed, 22 deletions(-)
>>>
>>> diff --git a/tests/avocado/boot_linux_console.py 
>>> b/tests/avocado/boot_linux_console.py
>>> index 231b4f68e5..5d978f6dd0 100644
>>> --- a/tests/avocado/boot_linux_console.py
>>> +++ b/tests/avocado/boot_linux_console.py
>>> @@ -116,28 +116,6 @@ def test_x86_64_pc(self):
>>>           console_pattern = 'Kernel command line: %s' % 
>>> kernel_command_line
>>>           self.wait_for_console_pattern(console_pattern)
>>> -    def test_mips_malta(self):
>>> -        """
>>> -        :avocado: tags=arch:mips
>>> -        :avocado: tags=machine:malta
>>> -        :avocado: tags=endian:big
>>> -        """
>>> -        deb_url = ('http://snapshot.debian.org/archive/debian/'
>>> -                   '20130217T032700Z/pool/main/l/linux-2.6/'
>>> -                   'linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb')
> 
> This link still works for me, what am I missing?
> 
> $ wget 
> http://snapshot.debian.org/archive/debian/20130217T032700Z/pool/main/l/linux-2.6/linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb
> --2023-12-01 14:55:31-- 
> http://snapshot.debian.org/archive/debian/20130217T032700Z/pool/main/l/linux-2.6/linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb
> Resolving snapshot.debian.org (snapshot.debian.org)... 185.17.185.185, 
> 193.62.202.27
> Connecting to snapshot.debian.org 
> (snapshot.debian.org)|185.17.185.185|:80... connected.
> HTTP request sent, awaiting response... 200 OK
> Length: 30231730 (29M)
> Saving to: ‘linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb’
> 
>     linux-image-2.6.32-5-4kc-ma  12%[=>    ]   3,71M  1,23MB/s    eta 20s

Sharing HTTP headers:

$ curl -v 
http://snapshot.debian.org/archive/debian/20130217T032700Z/pool/main/l/linux-2.6/linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb
*   Trying 193.62.202.27:80...
* Connected to snapshot.debian.org (193.62.202.27) port 80 (#0)
 > GET 
/archive/debian/20130217T032700Z/pool/main/l/linux-2.6/linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb 
HTTP/1.1
 > Host: snapshot.debian.org
 > User-Agent: curl/8.1.2
 > Accept: */*
 >
< HTTP/1.1 200 OK
< Date: Fri, 01 Dec 2023 13:54:55 GMT
< Server: Apache
< X-Content-Type-Options: nosniff
< X-Frame-Options: sameorigin
< Referrer-Policy: no-referrer
< X-Xss-Protection: 1
< Permissions-Policy: interest-cohort=()
< Last-Modified: Sun, 17 Feb 2013 03:34:37 GMT
< ETag: "1cd4cb2-4d5e349b3403e"
< Accept-Ranges: bytes
< Content-Length: 30231730
< X-Clacks-Overhead: GNU Terry Pratchett
< Cache-Control: max-age=31536000, public
< X-Varnish: 383440315
< Age: 0
< Via: 1.1 varnish (Varnish/6.5)
< connection: close

>> Anyway, the lesson is we can't rely on Debian snapshot mirror
>> anymore, so more need to be cleaned:
>>
>> $ git grep url.*snapshot.debian.org
>> tests/avocado/boot_linux_console.py:127:        deb_url = 
>> ('http://snapshot.debian.org/archive/debian/'
>> tests/avocado/boot_linux_console.py:160:        deb_url = 
>> ('http://snapshot.debian.org/archive/debian/'
>> tests/avocado/boot_linux_console.py:203:        deb_url = 
>> ('http://snapshot.debian.org/archive/debian/'
>> tests/avocado/boot_linux_console.py:513:        deb_url = 
>> ('https://snapshot.debian.org/archive/debian/'
>> tests/avocado/boot_linux_console.py:1129:        deb_url = 
>> ('http://snapshot.debian.org/archive/debian/'
>> tests/avocado/boot_linux_console.py:1255:        deb_url = 
>> ('https://snapshot.debian.org/archive/debian-ports'
>> tests/avocado/boot_linux_console.py:1299:        deb_url = 
>> ('http://snapshot.debian.org/archive/debian/'
>> tests/avocado/machine_s390_ccw_virtio.py:50:        kernel_url = 
>> ('https://snapshot.debian.org/archive/debian/'
>> tests/avocado/machine_s390_ccw_virtio.py:56:        initrd_url = 
>> ('https://snapshot.debian.org/archive/debian/'
>> tests/avocado/replay_kernel.py:110:        deb_url = 
>> ('http://snapshot.debian.org/archive/debian/'
>> tests/avocado/replay_kernel.py:139:        deb_url = 
>> ('http://snapshot.debian.org/archive/debian/'
>> tests/avocado/replay_kernel.py:287:        deb_url = 
>> ('https://snapshot.debian.org/archive/debian-ports'
>> tests/avocado/replay_kernel.py:445:        deb_url = 
>> ('http://snapshot.debian.org/archive/debian/'
> 


Re: [PATCH v2 3/7] tests/avocado: drop BootLinuxConsole.test_mips_malta_cpio test
Posted by Stefan Hajnoczi 12 months ago
On Fri, Dec 1, 2023, 04:38 Alex Bennée <alex.bennee@linaro.org> wrote:

> The assets are no longer archived by Debian so we can't run this on
> CI. While some people may still have the test in their cache we do
> have more recent images from tuxrun so this isn't a great loss.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  tests/avocado/boot_linux_console.py | 22 ----------------------
>  1 file changed, 22 deletions(-)
>

Acked-by: Stefan Hajnoczi <stefanha@redhat.com>


> diff --git a/tests/avocado/boot_linux_console.py
> b/tests/avocado/boot_linux_console.py
> index 231b4f68e5..5d978f6dd0 100644
> --- a/tests/avocado/boot_linux_console.py
> +++ b/tests/avocado/boot_linux_console.py
> @@ -116,28 +116,6 @@ def test_x86_64_pc(self):
>          console_pattern = 'Kernel command line: %s' % kernel_command_line
>          self.wait_for_console_pattern(console_pattern)
>
> -    def test_mips_malta(self):
> -        """
> -        :avocado: tags=arch:mips
> -        :avocado: tags=machine:malta
> -        :avocado: tags=endian:big
> -        """
> -        deb_url = ('http://snapshot.debian.org/archive/debian/'
> -                   '20130217T032700Z/pool/main/l/linux-2.6/'
> -                   'linux-image-2.6.32-5-4kc-malta_2.6.32-48_mips.deb')
> -        deb_hash = 'a8cfc28ad8f45f54811fc6cf74fc43ffcfe0ba04'
> -        deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
> -        kernel_path = self.extract_from_deb(deb_path,
> -
> '/boot/vmlinux-2.6.32-5-4kc-malta')
> -
> -        self.vm.set_console()
> -        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE +
> 'console=ttyS0'
> -        self.vm.add_args('-kernel', kernel_path,
> -                         '-append', kernel_command_line)
> -        self.vm.launch()
> -        console_pattern = 'Kernel command line: %s' % kernel_command_line
> -        self.wait_for_console_pattern(console_pattern)
> -
>      def test_mips64el_malta(self):
>          """
>          This test requires the ar tool to extract "data.tar.gz" from
> --
> 2.39.2
>
>
>