| Message ID | 20191122112231.18431-4-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | some tests/vm fixes | expand |
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"]) >
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"]) >>
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"])
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(-)