| Message ID | 20210304203540.41614-5-nieklinnenbank@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Allwinner H3 fixes for EMAC and acceptance tests | expand |
On Thu, Mar 4, 2021 at 5:45 PM Niek Linnenbank <nieklinnenbank@gmail.com> wrote: > > The linux kernel 4.20.7 binary for sunxi has been removed from apt.armbian.com: > > $ ARMBIAN_ARTIFACTS_CACHED=yes AVOCADO_ALLOW_LARGE_STORAGE=yes avocado --show=app,console run -t machine:orangepi-pc tests/acceptance/boot_linux_console.py > Fetching asset from tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_orangepi > ... > (1/6) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_orangepi: > CANCEL: Missing asset https://apt.armbian.com/pool/main/l/linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb (0.55 s) > > This commit updates the sunxi kernel to 5.10.16 for the acceptance > tests of the orangepi-pc and cubieboard machines. > > Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com> > --- > tests/acceptance/boot_linux_console.py | 40 +++++++++++++------------- > tests/acceptance/replay_kernel.py | 8 +++--- > 2 files changed, 24 insertions(+), 24 deletions(-) > I think some devs will not like it, but, for me, it is fine as we don't have the old kernel available anymore: Reviewed-by: Willian Rampazzo <willianr@redhat.com>
On 3/5/21 4:04 PM, Willian Rampazzo wrote: > On Thu, Mar 4, 2021 at 5:45 PM Niek Linnenbank <nieklinnenbank@gmail.com> wrote: >> >> The linux kernel 4.20.7 binary for sunxi has been removed from apt.armbian.com: >> >> $ ARMBIAN_ARTIFACTS_CACHED=yes AVOCADO_ALLOW_LARGE_STORAGE=yes avocado --show=app,console run -t machine:orangepi-pc tests/acceptance/boot_linux_console.py >> Fetching asset from tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_orangepi >> ... >> (1/6) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_orangepi: >> CANCEL: Missing asset https://apt.armbian.com/pool/main/l/linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb (0.55 s) >> >> This commit updates the sunxi kernel to 5.10.16 for the acceptance >> tests of the orangepi-pc and cubieboard machines. >> >> Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com> >> --- >> tests/acceptance/boot_linux_console.py | 40 +++++++++++++------------- >> tests/acceptance/replay_kernel.py | 8 +++--- >> 2 files changed, 24 insertions(+), 24 deletions(-) >> > > I think some devs will not like it, Maybe you refer to my previous NACKs regarding similar changes in integration tests. Niek is the author of the test and the maintainer of the machine, so if he is OK to stop testing the 4.20.7 kernels and test the 5.10.16 from now on, I won't object. > but, for me, it is fine as we > don't have the old kernel available anymore: > > Reviewed-by: Willian Rampazzo <willianr@redhat.com> >
Hi Philippe, Willian, Thanks for reviewing! On Mon, Mar 8, 2021 at 8:50 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > On 3/5/21 4:04 PM, Willian Rampazzo wrote: > > On Thu, Mar 4, 2021 at 5:45 PM Niek Linnenbank <nieklinnenbank@gmail.com> > wrote: > >> > >> The linux kernel 4.20.7 binary for sunxi has been removed from > apt.armbian.com: > >> > >> $ ARMBIAN_ARTIFACTS_CACHED=yes AVOCADO_ALLOW_LARGE_STORAGE=yes > avocado --show=app,console run -t machine:orangepi-pc > tests/acceptance/boot_linux_console.py > >> Fetching asset from > tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_orangepi > >> ... > >> (1/6) > tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_orangepi: > >> CANCEL: Missing asset > https://apt.armbian.com/pool/main/l/linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb > (0.55 s) > >> > >> This commit updates the sunxi kernel to 5.10.16 for the acceptance > >> tests of the orangepi-pc and cubieboard machines. > >> > >> Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com> > >> --- > >> tests/acceptance/boot_linux_console.py | 40 +++++++++++++------------- > >> tests/acceptance/replay_kernel.py | 8 +++--- > >> 2 files changed, 24 insertions(+), 24 deletions(-) > >> > > > > I think some devs will not like it, > Maybe you refer to my previous NACKs regarding similar changes in > integration tests. Niek is the author of the test and the maintainer > of the machine, so if he is OK to stop testing the 4.20.7 kernels > and test the 5.10.16 from now on, I won't object. > For me the 4.20.7 kernel would have been OK if it was still available. With that version removed, I looked at what is now available on https://apt.armbian.com/pool/main/l/. There are quite a lot of packaged kernels there and 5.10.16 seemed to me a good balance of running newer kernel code with a version that will hopefully stay around for a while. > > > but, for me, it is fine as we > > don't have the old kernel available anymore: > > > > Reviewed-by: Willian Rampazzo <willianr@redhat.com> > > > > Thanks, will add your reviewed-by tag. Regards, Niek
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 4a7a6830ca..04a8b23352 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -515,12 +515,12 @@ def test_arm_cubieboard_initrd(self): :avocado: tags=machine:cubieboard """ deb_url = ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb') - deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') + deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) kernel_path = self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path = '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path = '/usr/lib/linux-image-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/' @@ -557,12 +557,12 @@ def test_arm_cubieboard_sata(self): :avocado: tags=machine:cubieboard """ deb_url = ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb') - deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') + deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) kernel_path = self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path = '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path = '/usr/lib/linux-image-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/' @@ -686,12 +686,12 @@ def test_arm_orangepi(self): :avocado: tags=machine:orangepi-pc """ deb_url = ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb') - deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') + deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) kernel_path = self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path = '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path = '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi-pc.dtb' dtb_path = self.extract_from_deb(deb_path, dtb_path) self.vm.set_console() @@ -713,12 +713,12 @@ def test_arm_orangepi_initrd(self): :avocado: tags=machine:orangepi-pc """ deb_url = ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb') - deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') + deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) kernel_path = self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path = '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path = '/usr/lib/linux-image-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/' @@ -758,12 +758,12 @@ def test_arm_orangepi_sd(self): :avocado: tags=device:sd """ deb_url = ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb') - deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') + deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) kernel_path = self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path = '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path = '/usr/lib/linux-image-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/' 'kci-2019.02/armel/base/rootfs.ext2.xz') diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py index c1cb862468..8c68caae31 100644 --- a/tests/acceptance/replay_kernel.py +++ b/tests/acceptance/replay_kernel.py @@ -185,12 +185,12 @@ def test_arm_cubieboard_initrd(self): :avocado: tags=machine:cubieboard """ deb_url = ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb') - deb_hash = '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') + deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash) kernel_path = self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path = '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path = '/usr/lib/linux-image-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/'
The linux kernel 4.20.7 binary for sunxi has been removed from apt.armbian.com: $ ARMBIAN_ARTIFACTS_CACHED=yes AVOCADO_ALLOW_LARGE_STORAGE=yes avocado --show=app,console run -t machine:orangepi-pc tests/acceptance/boot_linux_console.py Fetching asset from tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_orangepi ... (1/6) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_orangepi: CANCEL: Missing asset https://apt.armbian.com/pool/main/l/linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.deb (0.55 s) This commit updates the sunxi kernel to 5.10.16 for the acceptance tests of the orangepi-pc and cubieboard machines. Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com> --- tests/acceptance/boot_linux_console.py | 40 +++++++++++++------------- tests/acceptance/replay_kernel.py | 8 +++--- 2 files changed, 24 insertions(+), 24 deletions(-)