[PATCH for 4.2 v1 0/3] some tests/vm fixes

[PATCH for 4.2 v1 0/3] some tests/vm fixes

[Alex Bennée]

Hi,

These fixes are aimed at improving the "vm-build-all" make target. The
first two are fairly non contriversal tweaks to the base
configuration. The final one just elides over the fact that the tests
are broken on 32bit 16.04 - but I think it may be a distro problem as
I've failed to replicate on my other 32 bit OSes. If anyone else wants
to figure out whats going on then be my guest ;-)

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

[PATCH v1 1/3] tests/vm/centos: fix centos build target

[Alex Bennée]

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>
---
 tests/vm/centos | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[PATCH v1 2/3] tests/vm/ubuntu: include language pack to silence locale warnings

[Alex Bennée]

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>
---
 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 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

Re: [PATCH v1 2/3] tests/vm/ubuntu: include language pack to silence locale warnings

[Philippe Mathieu-Daudé]

On 11/22/19 12:22 PM, Alex Bennée wrote:
> 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>
> ---
>   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 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)
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

[PATCH v1 3/3] tests/vm/ubuntu: update i386 image to 18.04

[Alex Bennée]

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>
---
 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 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

Re: [PATCH v1 3/3] tests/vm/ubuntu: update i386 image to 18.04

[Philippe Mathieu-Daudé]

On 11/22/19 12:22 PM, Alex Bennée wrote:
> 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

typo "our 32 bit"

> test image.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   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 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")

This one is in QCow2 format.

> +            "https://cloud-images.ubuntu.com/releases/bionic/release-20191114/ubuntu-18.04-server-cloudimg-i386.img",
> +            sha256sum="28969840626d1ea80bb249c08eef1a4533e8904aa51a327b40f37ac4b4ff04ef")

This one is announced as USB format (ISO) but is in QCow2 format too...

Using '18.04' instead of 'bionic' in the URL is not important because 
the information is also in the filename.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

>           img_tmp = img + ".tmp"
>           subprocess.check_call(["cp", "-f", cimg, img_tmp])
>           subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"])
> 

Re: [PATCH v1 3/3] tests/vm/ubuntu: update i386 image to 18.04

[Alex Bennée]

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> On 11/22/19 12:22 PM, Alex Bennée wrote:
>> 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
>
> typo "our 32 bit"
>
>> test image.
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>>   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 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")
>
> This one is in QCow2 format.
>
>> +            "https://cloud-images.ubuntu.com/releases/bionic/release-20191114/ubuntu-18.04-server-cloudimg-i386.img",
>> +            sha256sum="28969840626d1ea80bb249c08eef1a4533e8904aa51a327b40f37ac4b4ff04ef")
>
> This one is announced as USB format (ISO) but is in QCow2 format too...
>

heh I never noticed. It worked though ;-)

> Using '18.04' instead of 'bionic' in the URL is not important because
> the information is also in the filename.
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Thanks.

>
>>           img_tmp = img + ".tmp"
>>           subprocess.check_call(["cp", "-f", cimg, img_tmp])
>>           subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"])
>> 


-- 
Alex Bennée