summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2020-08-10 11:30:49 +0200
committerPhilippe Mathieu-Daudé2020-08-12 14:13:02 +0200
commitc45aed126f01b5f04d0d5ad703a252faed638c23 (patch)
treef8381549384c1edea1ebc9e1cc2f02554037dec1
parentUpdate version for v5.1.0 release (diff)
downloadqemu-c45aed126f01b5f04d0d5ad703a252faed638c23.tar.gz
qemu-c45aed126f01b5f04d0d5ad703a252faed638c23.tar.xz
qemu-c45aed126f01b5f04d0d5ad703a252faed638c23.zip
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é <philmd@redhat.com> Message-Id: <20200810093050.28744-2-philmd@redhat.com>
-rw-r--r--tests/acceptance/boot_linux_console.py11
1 files 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)