tests/vm/centos | 2 +- tests/vm/ubuntu.i386 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
The following changes since commit 65e05c82bdc6d348155e301c9d87dba7a08a5701: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2019-11-25 15:47:44 +0000) are available in the Git repository at: https://github.com/stsquad/qemu.git tags/pull-rc3-testing-261119-1 for you to fetch changes up to b3b9a433b0691b73c96d9ea4de67fe9c8ea293e8: tests/vm/ubuntu: update i386 image to 18.04 (2019-11-26 11:28:23 +0000) ---------------------------------------------------------------- A few vm-test updates - use Ubuntu 18.04 for i386 image - python3 for centos and docker - install locales for ubuntu ---------------------------------------------------------------- Alex Bennée (3): tests/vm/centos: fix centos build target tests/vm/ubuntu: include language pack to silence locale warnings tests/vm/ubuntu: update i386 image to 18.04 tests/vm/centos | 2 +- tests/vm/ubuntu.i386 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.20.1
On Tue, 26 Nov 2019 at 12:03, Alex Bennée <alex.bennee@linaro.org> wrote: > > The following changes since commit 65e05c82bdc6d348155e301c9d87dba7a08a5701: > > Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2019-11-25 15:47:44 +0000) > > are available in the Git repository at: > > https://github.com/stsquad/qemu.git tags/pull-rc3-testing-261119-1 > > for you to fetch changes up to b3b9a433b0691b73c96d9ea4de67fe9c8ea293e8: > > tests/vm/ubuntu: update i386 image to 18.04 (2019-11-26 11:28:23 +0000) > > ---------------------------------------------------------------- > A few vm-test updates > > - use Ubuntu 18.04 for i386 image > - python3 for centos and docker > - install locales for ubuntu > > ---------------------------------------------------------------- Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2 for any user-visible changes. -- PMM
To be able to run the docker tests centos has here we have to install python3 as well as the basic tools. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> diff --git a/tests/vm/centos b/tests/vm/centos index 53976f1c4c9..b9e851f2d33 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -73,7 +73,7 @@ class CentosVM(basevm.BaseVM): self.wait_ssh() self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") self.ssh_root_check("yum update -y") - self.ssh_root_check("yum install -y docker make git") + self.ssh_root_check("yum install -y docker make git python3") self.ssh_root_check("systemctl enable docker") self.ssh_root("poweroff") self.wait() -- 2.20.1
The iotests in particular don't like the output being spammed with warnings about locales. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 38f740eabf7..18b1ea2b72c 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -84,7 +84,7 @@ class UbuntuX86VM(basevm.BaseVM): self.ssh_root_check("sed -ie s/^#\ deb-src/deb-src/g /etc/apt/sources.list") self.ssh_root_check("apt-get update") self.ssh_root_check("apt-get build-dep -y qemu") - self.ssh_root_check("apt-get install -y libfdt-dev flex bison") + self.ssh_root_check("apt-get install -y libfdt-dev flex bison language-pack-en") self.ssh_root("poweroff") self.wait() os.rename(img_tmp, img) -- 2.20.1
The current image is broken while running qtests but the bug go away when built with a newer Ubuntu i386 image. I was unable to replicate the crash on Debian Buster for i386 either so I'm concluding it is a distro problem. Let's paper over that crack by updating our 32 bir test image. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 18b1ea2b72c..f611bebdc9d 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -66,8 +66,8 @@ class UbuntuX86VM(basevm.BaseVM): def build_image(self, img): cimg = self._download_with_cache( - "https://cloud-images.ubuntu.com/releases/16.04/release-20190605/ubuntu-16.04-server-cloudimg-i386-disk1.img", - sha256sum="e30091144c73483822b7c27193e9d47346dd1064229da577c3fedcf943f7cfcc") + "https://cloud-images.ubuntu.com/releases/bionic/release-20191114/ubuntu-18.04-server-cloudimg-i386.img", + sha256sum="28969840626d1ea80bb249c08eef1a4533e8904aa51a327b40f37ac4b4ff04ef") img_tmp = img + ".tmp" subprocess.check_call(["cp", "-f", cimg, img_tmp]) subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"]) -- 2.20.1
© 2016 - 2024 Red Hat, Inc.