Fixes to get CI green again
- fix m68k acceptance tests (Cleber) - stop build breakage (Daniel) -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAl26sNUACgkQ+9DbCVqe KkR6CAf/Vm0TUeofrjdGCrCRUPGhpKCg5OevY+3Ec6aJX6EqL2DIxe0BAp8rl9Pd 9vJFQuekFE05Z1FE9AeUXcIowzKxOhIHYzXEbzH+5F+ylVmW7BSP1ETyYRuwS8QN vu8kgxjJLIkCnTbxccdUI4G+5v6UKBpkMgIxllzYfyJd8yLeXVj9q1M1fsXSD+yy /PPVHmmLr7dT+WWp1BEhVUo4rH1AJhnCld6KPGe/fGpGfYk+6j/YjYlXhU+sDynJ ELP4S/Un8ab7ldqDM//5NgdtTRQk+Lq06fnMMh0xHxqgxs+6n5VAI3POX5ZH8v+q +qkcailIl/dFDrVEsG5ZL+FwNSudyg== =WRqN -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-311019-1' into staging Fixes to get CI green again - fix m68k acceptance tests (Cleber) - stop build breakage (Daniel) # gpg: Signature made Thu 31 Oct 2019 10:00:53 GMT # 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-311019-1: Acceptance test: update kernel for m68k/q800 test Acceptance test: cancel test if m68k kernel packages goes missing tests: fix conditional for disabling XTS test Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
741a90038b
|
@ -140,7 +140,7 @@ check-unit-y += tests/test-base64$(EXESUF)
|
|||
check-unit-$(call land,$(CONFIG_BLOCK),$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT))) += tests/test-crypto-pbkdf$(EXESUF)
|
||||
check-unit-$(CONFIG_BLOCK) += tests/test-crypto-ivgen$(EXESUF)
|
||||
check-unit-$(CONFIG_BLOCK) += tests/test-crypto-afsplit$(EXESUF)
|
||||
check-unit-$(if $(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) += tests/test-crypto-xts$(EXESUF)
|
||||
check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) += tests/test-crypto-xts$(EXESUF)
|
||||
check-unit-$(CONFIG_BLOCK) += tests/test-crypto-block$(EXESUF)
|
||||
check-unit-y += tests/test-logging$(EXESUF)
|
||||
check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_REPLICATION)) += tests/test-replication$(EXESUF)
|
||||
|
|
|
@ -480,11 +480,14 @@ class BootLinuxConsole(Test):
|
|||
:avocado: tags=machine:q800
|
||||
"""
|
||||
deb_url = ('http://ftp.ports.debian.org/debian-ports/pool-m68k/main'
|
||||
'/l/linux/kernel-image-5.2.0-2-m68k-di_5.2.9-2_m68k.udeb')
|
||||
deb_hash = '0797e05129595f22f3c0142db5e199769a723bf9'
|
||||
deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
|
||||
'/l/linux/kernel-image-5.3.0-1-m68k-di_5.3.7-1_m68k.udeb')
|
||||
deb_hash = '044954bb9be4160a3ce81f8bc1b5e856b75cccd1'
|
||||
try:
|
||||
deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
|
||||
except OSError as exp:
|
||||
self.cancel(exp)
|
||||
kernel_path = self.extract_from_deb(deb_path,
|
||||
'/boot/vmlinux-5.2.0-2-m68k')
|
||||
'/boot/vmlinux-5.3.0-1-m68k')
|
||||
|
||||
self.vm.set_machine('q800')
|
||||
self.vm.set_console()
|
||||
|
|
Loading…
Reference in a new issue