From 6cd7b60848c5217b323370c77838c48a5f5457ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Wed, 20 Nov 2019 15:11:12 +0000 Subject: tests/vm/centos: fix centos build target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé --- tests/vm/centos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/centos b/tests/vm/centos index 53976f1..b9e851f 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() -- cgit v1.1 From b4eca581b9abc214d2ab7c9c3cd30793042ecb24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Wed, 20 Nov 2019 19:46:05 +0000 Subject: tests/vm/ubuntu: include language pack to silence locale warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The iotests in particular don't like the output being spammed with warnings about locales. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/vm/ubuntu.i386 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 38f740e..18b1ea2 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) -- cgit v1.1 From b3b9a433b0691b73c96d9ea4de67fe9c8ea293e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Thu, 21 Nov 2019 16:58:38 +0000 Subject: tests/vm/ubuntu: update i386 image to 18.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Philippe Mathieu-Daudé --- tests/vm/ubuntu.i386 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 18b1ea2..f611bebd 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"]) -- cgit v1.1