| Message ID | 20200810092941.154911-1-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [for-5.1,v2] acceptance: use stable URLs for the Debian and Ubuntu installer | expand |
On 8/10/20 11:29 AM, Paolo Bonzini wrote: > The kernel and initrd hashes seem to have changed for the Bionic > aarch64 installer, causing BootLinuxConsole.test_aarch64_xlnx_versal_virt > to fail. Correct the paths to use the previous binaries instead of > the latest. Do the same for the Lenny alpha installer for > consistency, even though those are unlikely to change. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > tests/acceptance/boot_linux_console.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index 73cc69c499..57ba6328de 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -336,13 +336,13 @@ class BootLinuxConsole(LinuxKernelTest): > :avocado: tags=device:arm_gicv3 > """ > kernel_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/' > - 'bionic-updates/main/installer-arm64/current/images/' > + 'bionic-updates/main/installer-arm64/20101020ubuntu543.15/images/' This one fixes a problem, > 'netboot/ubuntu-installer/arm64/linux') > kernel_hash = '5bfc54cf7ed8157d93f6e5b0241e727b6dc22c50' > kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > > initrd_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/' > - 'bionic-updates/main/installer-arm64/current/images/' > + 'bionic-updates/main/installer-arm64/20101020ubuntu543.15/images/' this one too, > 'netboot/ubuntu-installer/arm64/initrd.gz') > initrd_hash = 'd385d3e88d53e2004c5d43cbe668b458a094f772' > initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash) > @@ -822,7 +822,7 @@ class BootLinuxConsole(LinuxKernelTest): > :avocado: tags=machine:clipper > """ > kernel_url = ('http://archive.debian.org/debian/dists/lenny/main/' > - 'installer-alpha/current/images/cdrom/vmlinuz') > + 'installer-alpha/20090123lenny10/images/cdrom/vmlinuz') this one fixes a pending problem (as described in commit). > kernel_hash = '3a943149335529e2ed3e74d0d787b85fb5671ba3' > kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On Mon, 10 Aug 2020 at 10:29, Paolo Bonzini <pbonzini@redhat.com> wrote: > > The kernel and initrd hashes seem to have changed for the Bionic > aarch64 installer, causing BootLinuxConsole.test_aarch64_xlnx_versal_virt > to fail. Correct the paths to use the previous binaries instead of > the latest. Do the same for the Lenny alpha installer for > consistency, even though those are unlikely to change. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> I've listed this on the Planning wiki page for the 5.1 release, but I don't think I want to roll an rc4 for it if we don't need to for some other reason. (The "block-copy feature can assert on unaligned images" issue which is the only other one listed is also in the "doesn't justify an rc4' bucket.) thanks -- PMM
On 8/10/20 11:29 AM, Paolo Bonzini wrote: > The kernel and initrd hashes seem to have changed for the Bionic > aarch64 installer, causing BootLinuxConsole.test_aarch64_xlnx_versal_virt > to fail. Correct the paths to use the previous binaries instead of > the latest. Do the same for the Lenny alpha installer for > consistency, even though those are unlikely to change. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > tests/acceptance/boot_linux_console.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py > index 73cc69c499..57ba6328de 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -336,13 +336,13 @@ class BootLinuxConsole(LinuxKernelTest): > :avocado: tags=device:arm_gicv3 > """ > kernel_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/' > - 'bionic-updates/main/installer-arm64/current/images/' > + 'bionic-updates/main/installer-arm64/20101020ubuntu543.15/images/' > 'netboot/ubuntu-installer/arm64/linux') > kernel_hash = '5bfc54cf7ed8157d93f6e5b0241e727b6dc22c50' > kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > > initrd_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/' > - 'bionic-updates/main/installer-arm64/current/images/' > + 'bionic-updates/main/installer-arm64/20101020ubuntu543.15/images/' > 'netboot/ubuntu-installer/arm64/initrd.gz') > initrd_hash = 'd385d3e88d53e2004c5d43cbe668b458a094f772' > initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash) > @@ -822,7 +822,7 @@ class BootLinuxConsole(LinuxKernelTest): > :avocado: tags=machine:clipper > """ > kernel_url = ('http://archive.debian.org/debian/dists/lenny/main/' > - 'installer-alpha/current/images/cdrom/vmlinuz') > + 'installer-alpha/20090123lenny10/images/cdrom/vmlinuz') > kernel_hash = '3a943149335529e2ed3e74d0d787b85fb5671ba3' > kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) > > Thanks, applied to my acceptance-testing tree.
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 73cc69c499..57ba6328de 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -336,13 +336,13 @@ class BootLinuxConsole(LinuxKernelTest): :avocado: tags=device:arm_gicv3 """ kernel_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/' - 'bionic-updates/main/installer-arm64/current/images/' + 'bionic-updates/main/installer-arm64/20101020ubuntu543.15/images/' 'netboot/ubuntu-installer/arm64/linux') kernel_hash = '5bfc54cf7ed8157d93f6e5b0241e727b6dc22c50' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) initrd_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/' - 'bionic-updates/main/installer-arm64/current/images/' + 'bionic-updates/main/installer-arm64/20101020ubuntu543.15/images/' 'netboot/ubuntu-installer/arm64/initrd.gz') initrd_hash = 'd385d3e88d53e2004c5d43cbe668b458a094f772' initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash) @@ -822,7 +822,7 @@ class BootLinuxConsole(LinuxKernelTest): :avocado: tags=machine:clipper """ kernel_url = ('http://archive.debian.org/debian/dists/lenny/main/' - 'installer-alpha/current/images/cdrom/vmlinuz') + 'installer-alpha/20090123lenny10/images/cdrom/vmlinuz') kernel_hash = '3a943149335529e2ed3e74d0d787b85fb5671ba3' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
The kernel and initrd hashes seem to have changed for the Bionic aarch64 installer, causing BootLinuxConsole.test_aarch64_xlnx_versal_virt to fail. Correct the paths to use the previous binaries instead of the latest. Do the same for the Lenny alpha installer for consistency, even though those are unlikely to change. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- tests/acceptance/boot_linux_console.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)