diff mbox series

[PULL,3/6] tests/avocado: drop BootLinuxConsole.test_mips_malta_cpio test

Message ID 20231201151228.2610209-4-alex.bennee@linaro.org
State New
Headers show
Series [PULL,1/6] gdbstub: use a better signal when we halt for IO reasons | expand

Commit Message

Alex Bennée Dec. 1, 2023, 3:12 p.m. UTC 
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.

Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231201093633.2551497-4-alex.bennee@linaro.org>

Comments

Philippe Mathieu-Daudé Dec. 1, 2023, 4:49 p.m. UTC | #1 
On 1/12/23 16:12, 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.
> 
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
> Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Message-Id: <20231201093633.2551497-4-alex.bennee@linaro.org>
> 
> diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
> index 231b4f68e5..ba2f99b53a 100644
> --- a/tests/avocado/boot_linux_console.py
> +++ b/tests/avocado/boot_linux_console.py
> @@ -191,47 +191,6 @@ def test_mips64el_fuloong2e(self):
>           console_pattern = 'Kernel command line: %s' % kernel_command_line
>           self.wait_for_console_pattern(console_pattern)
>   
> -    def test_mips_malta_cpio(self):
> -        """
> -        :avocado: tags=arch:mips
> -        :avocado: tags=machine:malta
> -        :avocado: tags=endian:big
> -        """
> -        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')

In https://lore.kernel.org/qemu-devel/87o7fa5505.fsf@draig.linaro.org/ 
you mention the linux-4.7 kernel but now you are removing the 4.5 which
also works...

$ wget 
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
--2023-12-01 17:46:49-- 
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
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: 29893440 (29M)
Saving to: ‘linux-image-4.5.0-2-4kc-malta_4.5.5-1_mips.deb’

linux-image-4.5.0-2-4kc-malta_4  12%[=>   ]   3,52M  1,07MB/s    eta 25s
^C

Can we not rush and figure out what is the problem please?

> -        deb_hash = 'a3c84f3e88b54e06107d65a410d1d1e8e0f340f8'
> -        deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
> -        kernel_path = self.extract_from_deb(deb_path,
> -                                            '/boot/vmlinux-4.5.0-2-4kc-malta')
> -        initrd_url = ('https://github.com/groeck/linux-build-test/raw/'
> -                      '8584a59ed9e5eb5ee7ca91f6d74bbb06619205b8/rootfs/'
> -                      'mips/rootfs.cpio.gz')
> -        initrd_hash = 'bf806e17009360a866bf537f6de66590de349a99'
> -        initrd_path_gz = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
> -        initrd_path = self.workdir + "rootfs.cpio"
> -        archive.gzip_uncompress(initrd_path_gz, initrd_path)
> -
> -        self.vm.set_console()
> -        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE
> -                               + 'console=ttyS0 console=tty '
> -                               + 'rdinit=/sbin/init noreboot')
> -        self.vm.add_args('-kernel', kernel_path,
> -                         '-initrd', initrd_path,
> -                         '-append', kernel_command_line,
> -                         '-no-reboot')
> -        self.vm.launch()
> -        self.wait_for_console_pattern('Boot successful.')
> -
> -        exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo',
> -                                                'BogoMIPS')
> -        exec_command_and_wait_for_pattern(self, 'uname -a',
> -                                                'Debian')
> -        exec_command_and_wait_for_pattern(self, 'reboot',
> -                                                'reboot: Restarting system')
> -        # Wait for VM to shut down gracefully
> -        self.vm.wait()
> -
>       @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
>       def test_mips64el_malta_5KEc_cpio(self):
>           """
Alex Bennée Dec. 1, 2023, 5:46 p.m. UTC | #2 
Philippe Mathieu-Daudé <philmd@linaro.org> writes:

> On 1/12/23 16:12, 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.
>> Cc: Stefan Hajnoczi <stefanha@redhat.com>
>> Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
>> Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> Message-Id: <20231201093633.2551497-4-alex.bennee@linaro.org>
>> diff --git a/tests/avocado/boot_linux_console.py
>> b/tests/avocado/boot_linux_console.py
>> index 231b4f68e5..ba2f99b53a 100644
>> --- a/tests/avocado/boot_linux_console.py
>> +++ b/tests/avocado/boot_linux_console.py
>> @@ -191,47 +191,6 @@ def test_mips64el_fuloong2e(self):
>>           console_pattern = 'Kernel command line: %s' % kernel_command_line
>>           self.wait_for_console_pattern(console_pattern)
>>   -    def test_mips_malta_cpio(self):
>> -        """
>> -        :avocado: tags=arch:mips
>> -        :avocado: tags=machine:malta
>> -        :avocado: tags=endian:big
>> -        """
>> -        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')
>
> In https://lore.kernel.org/qemu-devel/87o7fa5505.fsf@draig.linaro.org/
> you mention the linux-4.7 kernel but now you are removing the 4.5
> which
> also works...
>
> $ wget
> 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
> --2023-12-01 17:46:49--
>   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
> 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: 29893440 (29M)
> Saving to: ‘linux-image-4.5.0-2-4kc-malta_4.5.5-1_mips.deb’
>
> linux-image-4.5.0-2-4kc-malta_4  12%[=>   ]   3,52M  1,07MB/s    eta 25s
> ^C
>
> Can we not rush and figure out what is the problem please?

This was the failure on gitlab:

  https://gitlab.com/qemu-project/qemu/-/jobs/5637828476

>
>> -        deb_hash = 'a3c84f3e88b54e06107d65a410d1d1e8e0f340f8'
>> -        deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
>> -        kernel_path = self.extract_from_deb(deb_path,
>> -                                            '/boot/vmlinux-4.5.0-2-4kc-malta')
>> -        initrd_url = ('https://github.com/groeck/linux-build-test/raw/'
>> -                      '8584a59ed9e5eb5ee7ca91f6d74bbb06619205b8/rootfs/'
>> -                      'mips/rootfs.cpio.gz')
>> -        initrd_hash = 'bf806e17009360a866bf537f6de66590de349a99'
>> -        initrd_path_gz = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
>> -        initrd_path = self.workdir + "rootfs.cpio"
>> -        archive.gzip_uncompress(initrd_path_gz, initrd_path)
>> -
>> -        self.vm.set_console()
>> -        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE
>> -                               + 'console=ttyS0 console=tty '
>> -                               + 'rdinit=/sbin/init noreboot')
>> -        self.vm.add_args('-kernel', kernel_path,
>> -                         '-initrd', initrd_path,
>> -                         '-append', kernel_command_line,
>> -                         '-no-reboot')
>> -        self.vm.launch()
>> -        self.wait_for_console_pattern('Boot successful.')
>> -
>> -        exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo',
>> -                                                'BogoMIPS')
>> -        exec_command_and_wait_for_pattern(self, 'uname -a',
>> -                                                'Debian')
>> -        exec_command_and_wait_for_pattern(self, 'reboot',
>> -                                                'reboot: Restarting system')
>> -        # Wait for VM to shut down gracefully
>> -        self.vm.wait()
>> -
>>       @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
>>       def test_mips64el_malta_5KEc_cpio(self):
>>           """
diff mbox series

Patch

diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 231b4f68e5..ba2f99b53a 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -191,47 +191,6 @@  def test_mips64el_fuloong2e(self):
         console_pattern = 'Kernel command line: %s' % kernel_command_line
         self.wait_for_console_pattern(console_pattern)
 
-    def test_mips_malta_cpio(self):
-        """
-        :avocado: tags=arch:mips
-        :avocado: tags=machine:malta
-        :avocado: tags=endian:big
-        """
-        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')
-        deb_hash = 'a3c84f3e88b54e06107d65a410d1d1e8e0f340f8'
-        deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
-        kernel_path = self.extract_from_deb(deb_path,
-                                            '/boot/vmlinux-4.5.0-2-4kc-malta')
-        initrd_url = ('https://github.com/groeck/linux-build-test/raw/'
-                      '8584a59ed9e5eb5ee7ca91f6d74bbb06619205b8/rootfs/'
-                      'mips/rootfs.cpio.gz')
-        initrd_hash = 'bf806e17009360a866bf537f6de66590de349a99'
-        initrd_path_gz = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
-        initrd_path = self.workdir + "rootfs.cpio"
-        archive.gzip_uncompress(initrd_path_gz, initrd_path)
-
-        self.vm.set_console()
-        kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE
-                               + 'console=ttyS0 console=tty '
-                               + 'rdinit=/sbin/init noreboot')
-        self.vm.add_args('-kernel', kernel_path,
-                         '-initrd', initrd_path,
-                         '-append', kernel_command_line,
-                         '-no-reboot')
-        self.vm.launch()
-        self.wait_for_console_pattern('Boot successful.')
-
-        exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo',
-                                                'BogoMIPS')
-        exec_command_and_wait_for_pattern(self, 'uname -a',
-                                                'Debian')
-        exec_command_and_wait_for_pattern(self, 'reboot',
-                                                'reboot: Restarting system')
-        # Wait for VM to shut down gracefully
-        self.vm.wait()
-
     @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
     def test_mips64el_malta_5KEc_cpio(self):
         """