Hi Peter, I ran the avocado tests and this patch looks good to me. The only comment I have would be that the `test_arm-Orangepi_bionic_20_08` is not executed anymore since the image is not available, but I guess that can be another patch.
On Thu, Apr 25, 2024 at 9:31 PM Peter Maydell <peter.mayd...@linaro.org> wrote: > Whoops, forgot to cc the allwinner maintainers/reviewers on this. > Ping for review, please? > > thanks > -- PMM > > On Mon, 15 Apr 2024 at 16:18, Peter Maydell <peter.mayd...@linaro.org> > wrote: > > > > The Linux kernel 5.10.16 binary for sunxi has been removed from > > apt.armbian.com. This means that the avocado tests for these machines > > will be skipped (status CANCEL) if the old binary isn't present in > > the avocado cache. > > > > Update to 6.6.16, in the same way we did in commit e384db41d8661 > > when we moved to 5.10.16 in 2021. > > > > Cc: qemu-sta...@nongnu.org > > Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2284 > > Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> > > --- > > At this point in the release cycle I don't think I really want > > to put this into 9.0, though I could just about squeeze it in. > > > > cc'ing stable as an FYI -- since the tests fall back to the > > CANCEL status this doesn't break CI, so it's not a requirement > > to backport to any stable branches. But it would probably be > > preferable to get the coverage back on the stable branches so > > we can detect if we get something wrong on a backport of a > > patch that affects these machines. > > --- > > tests/avocado/boot_linux_console.py | 70 ++++++++++++++--------------- > > tests/avocado/replay_kernel.py | 8 ++-- > > 2 files changed, 39 insertions(+), 39 deletions(-) > > > > diff --git a/tests/avocado/boot_linux_console.py > b/tests/avocado/boot_linux_console.py > > index 989b65111c0..d0ab5aaa83a 100644 > > --- a/tests/avocado/boot_linux_console.py > > +++ b/tests/avocado/boot_linux_console.py > > @@ -646,12 +646,12 @@ def test_arm_cubieboard_initrd(self): > > :avocado: tags=accel:tcg > > """ > > deb_url = ('https://apt.armbian.com/pool/main/l/' > > - > 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') > > - deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' > > + > > 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6.6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') > > + deb_hash = 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' > > deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) > > kernel_path = self.extract_from_deb(deb_path, > > - > '/boot/vmlinuz-5.10.16-sunxi') > > - dtb_path = > '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubieboard.dtb' > > + > '/boot/vmlinuz-6.6.16-current-sunxi') > > + dtb_path = > '/usr/lib/linux-image-6.6.16-current-sunxi/sun4i-a10-cubieboard.dtb' > > dtb_path = self.extract_from_deb(deb_path, dtb_path) > > initrd_url = ('https://github.com/groeck/linux-build-test/raw/' > > '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' > > @@ -690,12 +690,12 @@ def test_arm_cubieboard_sata(self): > > :avocado: tags=accel:tcg > > """ > > deb_url = ('https://apt.armbian.com/pool/main/l/' > > - > 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') > > - deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' > > + > > 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6.6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') > > + deb_hash = 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' > > deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) > > kernel_path = self.extract_from_deb(deb_path, > > - > '/boot/vmlinuz-5.10.16-sunxi') > > - dtb_path = > '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubieboard.dtb' > > + > '/boot/vmlinuz-6.6.16-current-sunxi') > > + dtb_path = > '/usr/lib/linux-image-6.6.16-current-sunxi/sun4i-a10-cubieboard.dtb' > > dtb_path = self.extract_from_deb(deb_path, dtb_path) > > rootfs_url = ('https://github.com/groeck/linux-build-test/raw/' > > '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' > > @@ -872,13 +872,13 @@ def test_arm_bpim2u(self): > > :avocado: tags=machine:bpim2u > > :avocado: tags=accel:tcg > > """ > > - deb_url = (' > https://apt.armbian.com/pool/main/l/linux-5.10.16-sunxi/' > > - 'linux-image-current-sunxi_21.02.2_armhf.deb') > > - deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' > > + deb_url = ('https://apt.armbian.com/pool/main/l/' > > + > > 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6.6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') > > + deb_hash = 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' > > deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) > > kernel_path = self.extract_from_deb(deb_path, > > - > '/boot/vmlinuz-5.10.16-sunxi') > > - dtb_path = ('/usr/lib/linux-image-current-sunxi/' > > + > '/boot/vmlinuz-6.6.16-current-sunxi') > > + dtb_path = ('/usr/lib/linux-image-6.6.16-current-sunxi/' > > 'sun8i-r40-bananapi-m2-ultra.dtb') > > dtb_path = self.extract_from_deb(deb_path, dtb_path) > > > > @@ -899,13 +899,13 @@ def test_arm_bpim2u_initrd(self): > > :avocado: tags=accel:tcg > > :avocado: tags=machine:bpim2u > > """ > > - deb_url = (' > https://apt.armbian.com/pool/main/l/linux-5.10.16-sunxi/' > > - 'linux-image-current-sunxi_21.02.2_armhf.deb') > > - deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' > > + deb_url = ('https://apt.armbian.com/pool/main/l/' > > + > > 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6.6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') > > + deb_hash = 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' > > deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) > > kernel_path = self.extract_from_deb(deb_path, > > - > '/boot/vmlinuz-5.10.16-sunxi') > > - dtb_path = ('/usr/lib/linux-image-current-sunxi/' > > + > '/boot/vmlinuz-6.6.16-current-sunxi') > > + dtb_path = ('/usr/lib/linux-image-6.6.16-current-sunxi/' > > 'sun8i-r40-bananapi-m2-ultra.dtb') > > dtb_path = self.extract_from_deb(deb_path, dtb_path) > > initrd_url = ('https://github.com/groeck/linux-build-test/raw/' > > @@ -946,13 +946,13 @@ def test_arm_bpim2u_gmac(self): > > """ > > self.require_netdev('user') > > > > - deb_url = (' > https://apt.armbian.com/pool/main/l/linux-5.10.16-sunxi/' > > - 'linux-image-current-sunxi_21.02.2_armhf.deb') > > - deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' > > + deb_url = ('https://apt.armbian.com/pool/main/l/' > > + > > 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6.6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') > > + deb_hash = 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' > > deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) > > kernel_path = self.extract_from_deb(deb_path, > > - > '/boot/vmlinuz-5.10.16-sunxi') > > - dtb_path = ('/usr/lib/linux-image-current-sunxi/' > > + > '/boot/vmlinuz-6.6.16-current-sunxi') > > + dtb_path = ('/usr/lib/linux-image-6.6.16-current-sunxi/' > > 'sun8i-r40-bananapi-m2-ultra.dtb') > > dtb_path = self.extract_from_deb(deb_path, dtb_path) > > rootfs_url = (' > http://storage.kernelci.org/images/rootfs/buildroot/' > > @@ -1049,12 +1049,12 @@ def test_arm_orangepi(self): > > :avocado: tags=accel:tcg > > """ > > deb_url = ('https://apt.armbian.com/pool/main/l/' > > - > 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') > > - deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' > > + > > 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6.6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') > > + deb_hash = 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' > > deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) > > kernel_path = self.extract_from_deb(deb_path, > > - > '/boot/vmlinuz-5.10.16-sunxi') > > - dtb_path = > '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi-pc.dtb' > > + > '/boot/vmlinuz-6.6.16-current-sunxi') > > + dtb_path = > '/usr/lib/linux-image-6.6.16-current-sunxi/sun8i-h3-orangepi-pc.dtb' > > dtb_path = self.extract_from_deb(deb_path, dtb_path) > > > > self.vm.set_console() > > @@ -1075,12 +1075,12 @@ def test_arm_orangepi_initrd(self): > > :avocado: tags=machine:orangepi-pc > > """ > > deb_url = ('https://apt.armbian.com/pool/main/l/' > > - > 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') > > - deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' > > + > > 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6.6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') > > + deb_hash = 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' > > deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) > > kernel_path = self.extract_from_deb(deb_path, > > - > '/boot/vmlinuz-5.10.16-sunxi') > > - dtb_path = > '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi-pc.dtb' > > + > '/boot/vmlinuz-6.6.16-current-sunxi') > > + dtb_path = > '/usr/lib/linux-image-6.6.16-current-sunxi/sun8i-h3-orangepi-pc.dtb' > > dtb_path = self.extract_from_deb(deb_path, dtb_path) > > initrd_url = ('https://github.com/groeck/linux-build-test/raw/' > > '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' > > @@ -1121,12 +1121,12 @@ def test_arm_orangepi_sd(self): > > self.require_netdev('user') > > > > deb_url = ('https://apt.armbian.com/pool/main/l/' > > - > 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') > > - deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' > > + > > 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6.6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') > > + deb_hash = 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' > > deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) > > kernel_path = self.extract_from_deb(deb_path, > > - > '/boot/vmlinuz-5.10.16-sunxi') > > - dtb_path = > '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi-pc.dtb' > > + > '/boot/vmlinuz-6.6.16-current-sunxi') > > + dtb_path = > '/usr/lib/linux-image-6.6.16-current-sunxi/sun8i-h3-orangepi-pc.dtb' > > dtb_path = self.extract_from_deb(deb_path, dtb_path) > > rootfs_url = (' > http://storage.kernelci.org/images/rootfs/buildroot/' > > > 'buildroot-baseline/20221116.0/armel/rootfs.ext2.xz') > > diff --git a/tests/avocado/replay_kernel.py > b/tests/avocado/replay_kernel.py > > index 10d99403a4c..0474f7b7c8e 100644 > > --- a/tests/avocado/replay_kernel.py > > +++ b/tests/avocado/replay_kernel.py > > @@ -203,12 +203,12 @@ def test_arm_cubieboard_initrd(self): > > :avocado: tags=machine:cubieboard > > """ > > deb_url = ('https://apt.armbian.com/pool/main/l/' > > - > 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') > > - deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' > > + > > 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6.6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') > > + deb_hash = 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' > > deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) > > kernel_path = self.extract_from_deb(deb_path, > > - > '/boot/vmlinuz-5.10.16-sunxi') > > - dtb_path = > '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubieboard.dtb' > > + > '/boot/vmlinuz-6.6.16-current-sunxi') > > + dtb_path = > '/usr/lib/linux-image-6.6.16-current-sunxi/sun4i-a10-cubieboard.dtb' > > dtb_path = self.extract_from_deb(deb_path, dtb_path) > > initrd_url = ('https://github.com/groeck/linux-build-test/raw/' > > '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' > > -- > > 2.34.1 > > > Reviewed-by: Strahinja Jankovic <strahinja.p.janko...@gmail.com> Best regards, Strahinja
