tests/acceptance/boot_linux: Extract common URL from xlnx-versal test
authorPhilippe Mathieu-Daudé <philmd@redhat.com>
Mon, 10 Aug 2020 09:30:49 +0000 (11:30 +0200)
committerPhilippe Mathieu-Daudé <philmd@redhat.com>
Wed, 12 Aug 2020 12:13:02 +0000 (14:13 +0200)
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>

tests/acceptance/boot_linux_console.py

index 73cc69c4995a623ecdfed448c7773f9c745b067f..2f22eddd0d0862a2f9fc441b685327e881997cb2 100644 (file)
@@ -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)