[PATCH v2 0/2] acceptance: update asset urls for the Bionic aarch64 installer

[PATCH v2 0/2] acceptance: update asset urls for the Bionic aarch64 installer

[Philippe Mathieu-Daudé]

v2 of Paolo's patch:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg728610.html

Do not update the binaries (and their hash), update the path to
the current tested binaries.

Supersedes: <20200809223741.56570-1-pbonzini@redhat.com>

Philippe Mathieu-Daudé (2):
  tests/acceptance/boot_linux: Extract common URL from xlnx-versal test
  tests/acceptance/boot_linux: Use stable URL for xlnx-versal test

 tests/acceptance/boot_linux_console.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

-- 
2.21.3

[PATCH v2 1/2] tests/acceptance/boot_linux: Extract common URL from xlnx-versal test

[Philippe Mathieu-Daudé]

Both files refer to the same directory. Store the common part in
a new variable.

Signed-off-by: Philippe Mathieu-Daudé <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 @@ def test_aarch64_xlnx_versal_virt(self):
         :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)
 
-- 
2.21.3

[PATCH v2 2/2] tests/acceptance/boot_linux: Use stable URL for xlnx-versal test

[Philippe Mathieu-Daudé]

In commit 27dfbafaa7 we added an acceptance test for the
xlnx-versal-virt machine but used an unstable URL (no guarantee
the files would be updated during the next release, which occured
last week on Wednesday, Aug 5). Fix by using the stable directory
name containing the release date.

Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/acceptance/boot_linux_console.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
index 2f22eddd0d..742dc30bc1 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -337,7 +337,7 @@ def test_aarch64_xlnx_versal_virt(self):
         """
         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)
-- 
2.21.3

Re: [PATCH v2 0/2] acceptance: update asset urls for the Bionic aarch64 installer

[Philippe Mathieu-Daudé]

On 8/10/20 11:30 AM, Philippe Mathieu-Daudé wrote:
> v2 of Paolo's patch:
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg728610.html
> 
> Do not update the binaries (and their hash), update the path to
> the current tested binaries.
> 
> Supersedes: <20200809223741.56570-1-pbonzini@redhat.com>
> 
> Philippe Mathieu-Daudé (2):
>   tests/acceptance/boot_linux: Extract common URL from xlnx-versal test
>   tests/acceptance/boot_linux: Use stable URL for xlnx-versal test
> 
>  tests/acceptance/boot_linux_console.py | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
> 

First patch applied to my acceptance-testing tree.