* [PULL 1/3] tests: fix conditional for disabling XTS test
2019-10-31 10:02 [PULL 0/3] a couple of CI fixes Alex Bennée
@ 2019-10-31 10:02 ` Alex Bennée
2019-10-31 10:02 ` [PULL 2/3] Acceptance test: cancel test if m68k kernel packages goes missing Alex Bennée
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Alex Bennée @ 2019-10-31 10:02 UTC (permalink / raw)
To: peter.maydell; +Cc: Alex Bennée, Daniel P. Berrangé, qemu-devel
From: Daniel P. Berrangé <berrange@redhat.com>
The intent is to only enable the XTS test if both CONFIG_BLOCK
and CONFIG_QEMU_PRIVATE_XTS are set to 'y'.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20191030151740.14326-1-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/Makefile.include b/tests/Makefile.include
index c79402ab758..7715d8cd63a 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -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)
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PULL 2/3] Acceptance test: cancel test if m68k kernel packages goes missing
2019-10-31 10:02 [PULL 0/3] a couple of CI fixes Alex Bennée
2019-10-31 10:02 ` [PULL 1/3] tests: fix conditional for disabling XTS test Alex Bennée
@ 2019-10-31 10:02 ` Alex Bennée
2019-10-31 10:02 ` [PULL 3/3] Acceptance test: update kernel for m68k/q800 test Alex Bennée
2019-10-31 11:05 ` [PULL 0/3] a couple of CI fixes Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Alex Bennée @ 2019-10-31 10:02 UTC (permalink / raw)
To: peter.maydell; +Cc: Alex Bennée, qemu-devel, Cleber Rosa
From: Cleber Rosa <crosa@redhat.com>
The Linux kernel that is extracted from a Debian package for the q800
machine test is hosted on a "pool" location. AFAICT, it gets updated
without too much ceremony, and I don't see any archival location that
is stable enough.
For now, to avoid test errors, let's cancel the test if fetching the
package fails.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20191029232320.12419-2-crosa@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
index 4e9ac0ecc36..880a4b31ee1 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -482,7 +482,10 @@ class BootLinuxConsole(Test):
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)
+ 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')
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PULL 3/3] Acceptance test: update kernel for m68k/q800 test
2019-10-31 10:02 [PULL 0/3] a couple of CI fixes Alex Bennée
2019-10-31 10:02 ` [PULL 1/3] tests: fix conditional for disabling XTS test Alex Bennée
2019-10-31 10:02 ` [PULL 2/3] Acceptance test: cancel test if m68k kernel packages goes missing Alex Bennée
@ 2019-10-31 10:02 ` Alex Bennée
2019-10-31 11:05 ` [PULL 0/3] a couple of CI fixes Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Alex Bennée @ 2019-10-31 10:02 UTC (permalink / raw)
To: peter.maydell; +Cc: Alex Bennée, qemu-devel, Cleber Rosa
From: Cleber Rosa <crosa@redhat.com>
There's an updated version of the Debian package containing the m68k
Kernel.
Now, if the package gets updated again, the test won't fail, but will
be canceled. A more permanent solution is certainly needed.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20191029232320.12419-3-crosa@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
index 880a4b31ee1..7e41cebd47d 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -480,14 +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'
+ '/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()
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PULL 0/3] a couple of CI fixes
2019-10-31 10:02 [PULL 0/3] a couple of CI fixes Alex Bennée
` (2 preceding siblings ...)
2019-10-31 10:02 ` [PULL 3/3] Acceptance test: update kernel for m68k/q800 test Alex Bennée
@ 2019-10-31 11:05 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2019-10-31 11:05 UTC (permalink / raw)
To: Alex Bennée; +Cc: QEMU Developers
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.
-- PMM
On Thu, 31 Oct 2019 at 10:02, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> The following changes since commit 68d8ef4ec540682c3538d4963e836e43a211dd17:
>
> Merge remote-tracking branch 'remotes/stsquad/tags/pull-tcg-plugins-281019-4' into staging (2019-10-30 14:10:32 +0000)
>
> are available in the Git repository at:
>
> https://github.com/stsquad/qemu.git tags/pull-testing-next-311019-1
>
> for you to fetch changes up to 2ecde8b2fb046516a0f2f53fb56b86db92d6fc13:
>
> Acceptance test: update kernel for m68k/q800 test (2019-10-31 09:58:20 +0000)
>
> ----------------------------------------------------------------
> Fixes to get CI green again
>
> - fix m68k acceptance tests (Cleber)
> - stop build breakage (Daniel)
>
^ permalink raw reply [flat|nested] 5+ messages in thread