[PULL 0/2] Acceptance testing patches for 2020-08-12

[PULL 0/2] Acceptance testing patches for 2020-08-12

[Philippe Mathieu-Daudé]

The following changes since commit d0ed6a69d399ae193959225cdeaa9382746c91cc:

  Update version for v5.1.0 release (2020-08-11 17:07:03 +0100)

are available in the Git repository at:

  https://gitlab.com/philmd/qemu.git tags/acceptance-testing-20200812

for you to fetch changes up to 0eca1f4b5c1a6cf8f05ff7da72a4e97b41894e84:

  acceptance: use stable URLs for the Debian and Ubuntu installer (2020-08-12=
 14:14:28 +0200)

----------------------------------------------------------------
Acceptance tests patches

- Use stable URLs for the Debian and Ubuntu installer
  (Ubuntu has been updated last Wednesday, August 5, 2020).

CI jobs results:
. https://cirrus-ci.com/build/6385815351721984
. https://gitlab.com/philmd/qemu/-/pipelines/177054604

----------------------------------------------------------------

Paolo Bonzini (1):
  acceptance: use stable URLs for the Debian and Ubuntu installer

Philippe Mathieu-Daud=C3=A9 (1):
  tests/acceptance/boot_linux: Extract common URL from xlnx-versal test

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

--=20
2.21.3

[PULL 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>
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 @@ 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

[PULL 2/2] acceptance: use stable URLs for the Debian and Ubuntu installer

[Philippe Mathieu-Daudé]

From: Paolo Bonzini <pbonzini@redhat.com>

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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
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 @@ 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)
@@ -821,7 +821,7 @@ def test_alpha_clipper(self):
         :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)
 
-- 
2.21.3

Re: [PULL 0/2] Acceptance testing patches for 2020-08-12

[Peter Maydell]

On Wed, 12 Aug 2020 at 14:19, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> The following changes since commit d0ed6a69d399ae193959225cdeaa9382746c91cc:
>
>   Update version for v5.1.0 release (2020-08-11 17:07:03 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/philmd/qemu.git tags/acceptance-testing-20200812
>
> for you to fetch changes up to 0eca1f4b5c1a6cf8f05ff7da72a4e97b41894e84:
>
>   acceptance: use stable URLs for the Debian and Ubuntu installer (2020-08-12=
>  14:14:28 +0200)
>
> ----------------------------------------------------------------
> Acceptance tests patches
>
> - Use stable URLs for the Debian and Ubuntu installer
>   (Ubuntu has been updated last Wednesday, August 5, 2020).
>
> CI jobs results:
> . https://cirrus-ci.com/build/6385815351721984
> . https://gitlab.com/philmd/qemu/-/pipelines/177054604


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.

-- PMM