diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-08-21 14:51:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-08-21 14:51:43 +0100 |
| commit | d6f83a72a7db94a3ede9f5cc4fb39f9c8e89f954 (patch) | |
| tree | 8251b1ed87c6c77394dc2b894a7067d8857e164f /tests/acceptance | |
| parent | 7fd51e68c34fcefdb4d6fd646ed3346f780f89f4 (diff) | |
| parent | 0eca1f4b5c1a6cf8f05ff7da72a4e97b41894e84 (diff) | |
Merge remote-tracking branch 'remotes/philmd-gitlab/tags/acceptance-testing-20200812' into staging
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
# gpg: Signature made Wed 12 Aug 2020 14:17:09 BST
# gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE
* remotes/philmd-gitlab/tags/acceptance-testing-20200812:
acceptance: use stable URLs for the Debian and Ubuntu installer
tests/acceptance/boot_linux: Extract common URL from xlnx-versal test
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/acceptance')
| -rw-r--r-- | tests/acceptance/boot_linux_console.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 73cc69c499..aaa781a581 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/' + '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) - 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) @@ -822,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) |