From c45aed126f01b5f04d0d5ad703a252faed638c23 Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daudé Date: Mon, 10 Aug 2020 11:30:49 +0200 Subject: tests/acceptance/boot_linux: Extract common URL from xlnx-versal test Both files refer to the same directory. Store the common part in a new variable. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200810093050.28744-2-philmd@redhat.com> --- tests/acceptance/boot_linux_console.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 73cc69c499..2f22eddd0d 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -335,15 +335,14 @@ class BootLinuxConsole(LinuxKernelTest): :avocado: tags=device:pl011 :avocado: tags=device:arm_gicv3 """ - kernel_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/' - 'bionic-updates/main/installer-arm64/current/images/' - 'netboot/ubuntu-installer/arm64/linux') + images_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/' + 'bionic-updates/main/installer-arm64/' + 'current/images/') + kernel_url = images_url + '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/' - 'netboot/ubuntu-installer/arm64/initrd.gz') + initrd_url = images_url + 'netboot/ubuntu-installer/arm64/initrd.gz' initrd_hash = 'd385d3e88d53e2004c5d43cbe668b458a094f772' initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash) -- cgit v1.2.3-55-g7522 From 0eca1f4b5c1a6cf8f05ff7da72a4e97b41894e84 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 10 Aug 2020 11:29:41 +0200 Subject: acceptance: use stable URLs for the Debian and Ubuntu installer 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20200810092941.154911-1-pbonzini@redhat.com> --- tests/acceptance/boot_linux_console.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 2f22eddd0d..aaa781a581 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -337,7 +337,7 @@ class BootLinuxConsole(LinuxKernelTest): """ images_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/' 'bionic-updates/main/installer-arm64/' - 'current/images/') + '20101020ubuntu543.15/images/') kernel_url = images_url + 'netboot/ubuntu-installer/arm64/linux' kernel_hash = '5bfc54cf7ed8157d93f6e5b0241e727b6dc22c50' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) @@ -821,7 +821,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) -- cgit v1.2.3-55-g7522