summaryrefslogtreecommitdiffstats
path: root/tests/acceptance/boot_linux_console.py
diff options
context:
space:
mode:
authorPeter Maydell2019-09-10 15:52:09 +0200
committerPeter Maydell2019-09-10 15:52:09 +0200
commit6d2fdde42c3344099262431df6a3f429c509291d (patch)
treed91e66512048e764849b3ebf7f9c9dba83c34c65 /tests/acceptance/boot_linux_console.py
parentMerge remote-tracking branch 'remotes/huth-gitlab/tags/m68k-pull-2019-09-07' ... (diff)
parenttests/tcg: fix typo when calling clean-tcg (diff)
downloadqemu-6d2fdde42c3344099262431df6a3f429c509291d.tar.gz
qemu-6d2fdde42c3344099262431df6a3f429c509291d.tar.xz
qemu-6d2fdde42c3344099262431df6a3f429c509291d.zip
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-100919-2' into staging
Testing fixes: - podman cleanups - docker.py python3 fixes (encode) - DEF_TARGET_LIST applied to cross build images - move a bunch to Buster based images - enable Travis caching - more common objs for faster builds - stable URLs for acceptance tests - additional travis dependencies - work around ppc64abi32 linux-test breakage [v2] # gpg: Signature made Tue 10 Sep 2019 14:16:00 BST # gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44 # gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full] # Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44 * remotes/stsquad/tags/pull-testing-next-100919-2: (46 commits) tests/tcg: fix typo when calling clean-tcg travis.yml: Install libcap-dev for testing virito-9p Fedora images: use URLs from stable "archives.fedoraproject.org" .travis.yml: Cache Linux/Clang jobs together .travis.yml: Cache Linux/GCC 'non-debug profile' jobs together .travis.yml: Cache Linux/GCC 'debug profile' jobs together .travis.yml: Document how the build matrix use caches .travis.yml: Enable ccache on OSX .travis.yml: Improve ccache use .travis.yml: Cache Avocado cache .travis.yml: Cache Python PIP packages .travis.yml: Increase cache timeout from 3min to 20min .travis.yml: Enable multiple caching features configure: check if --no-pie is supported first tests/docker: --disable-libssh on ubuntu1804 builds tests/docker: add more images to PARTIAL_IMAGES when not on x86_64 tests/docker: use --arch-only for installing deps tests/docker: add debian-amd64-cross for non-x86 hosts tests/docker: avoid $SHELL invoke bash directly tests/docker: add debian9-mxe to DEBIAN_PARTIAL_IMAGES ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/acceptance/boot_linux_console.py')
-rw-r--r--tests/acceptance/boot_linux_console.py25
1 files changed, 15 insertions, 10 deletions
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
index 2504ef0150..8a9a314ab4 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -76,8 +76,9 @@ class BootLinuxConsole(Test):
:avocado: tags=arch:x86_64
:avocado: tags=machine:pc
"""
- kernel_url = ('https://download.fedoraproject.org/pub/fedora/linux/'
- 'releases/29/Everything/x86_64/os/images/pxeboot/vmlinuz')
+ kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
+ '/linux/releases/29/Everything/x86_64/os/images/pxeboot'
+ '/vmlinuz')
kernel_hash = '23bebd2680757891cf7adedb033532163a792495'
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
@@ -250,8 +251,9 @@ class BootLinuxConsole(Test):
:avocado: tags=arch:aarch64
:avocado: tags=machine:virt
"""
- kernel_url = ('https://download.fedoraproject.org/pub/fedora/linux/'
- 'releases/29/Everything/aarch64/os/images/pxeboot/vmlinuz')
+ kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
+ '/linux/releases/29/Everything/aarch64/os/images/pxeboot'
+ '/vmlinuz')
kernel_hash = '8c73e469fc6ea06a58dc83a628fc695b693b8493'
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
@@ -271,8 +273,9 @@ class BootLinuxConsole(Test):
:avocado: tags=arch:arm
:avocado: tags=machine:virt
"""
- kernel_url = ('https://download.fedoraproject.org/pub/fedora/linux/'
- 'releases/29/Everything/armhfp/os/images/pxeboot/vmlinuz')
+ kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
+ '/linux/releases/29/Everything/armhfp/os/images/pxeboot'
+ '/vmlinuz')
kernel_hash = 'e9826d741b4fb04cadba8d4824d1ed3b7fb8b4d4'
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
@@ -318,8 +321,9 @@ class BootLinuxConsole(Test):
:avocado: tags=arch:s390x
:avocado: tags=machine:s390_ccw_virtio
"""
- kernel_url = ('https://download.fedoraproject.org/pub/fedora-secondary/'
- 'releases/29/Everything/s390x/os/images/kernel.img')
+ kernel_url = ('https://archives.fedoraproject.org/pub/archive'
+ '/fedora-secondary/releases/29/Everything/s390x/os/images'
+ '/kernel.img')
kernel_hash = 'e8e8439103ef8053418ef062644ffd46a7919313'
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
@@ -360,8 +364,9 @@ class BootLinuxConsole(Test):
:avocado: tags=arch:ppc64
:avocado: tags=machine:pseries
"""
- kernel_url = ('https://download.fedoraproject.org/pub/fedora-secondary/'
- 'releases/29/Everything/ppc64le/os/ppc/ppc64/vmlinuz')
+ kernel_url = ('https://archives.fedoraproject.org/pub/archive'
+ '/fedora-secondary/releases/29/Everything/ppc64le/os'
+ '/ppc/ppc64/vmlinuz')
kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77'
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)