Message ID | 20230116083014.55647-1-thuth@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | tests/vm/haiku.x86_64: Update the Haiku VM to Beta 4 | expand |
On 16/1/23 09:30, Thomas Huth wrote: > The old Haiku VM based on Beta 3 does not work anymore since it > fails to install the additional packages now that Beta 4 has been > released. Thanks to Alexander von Gluck IV for providing a new > image based on Beta 4, we can now upgrade the test image in our > QEMU CI, too, to get this working again. > > Note that Haiku Beta 4 apparently finally fixed the issue with > the enumeration of the virtio-block devices (see the ticket at > https://dev.haiku-os.org/ticket/16512 ) - the tarball disk can > now be found at index 1 instead of index 0. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > tests/vm/haiku.x86_64 | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 > index 29668bc272..8b0d1b8954 100755 > --- a/tests/vm/haiku.x86_64 > +++ b/tests/vm/haiku.x86_64 > @@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM): > name = "haiku" > arch = "x86_64" > > - link = "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/versions/20220216/providers/libvirt.box" > - csum = "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d5041" > + link = "https://app.vagrantup.com/haiku-os/boxes/r1beta4-x86_64/versions/20230114/providers/libvirt.box" > + csum = "6e72a2a470e03dbc3c5e808664e057bb4022b390dca88e4c7da6188f26f6a3c9" Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org> To keep builds reproducible I'd rather stick the repo with the base image used, something like: release_tag = 'r1beta4' self.ssh_root_check("pkgman drop-repo -y Haiku") self.ssh_root_check("pkgman drop-repo -y HaikuPorts") self.ssh_root_check(f"pkgman add-repo -y https://eu.hpkg.haiku-os.org/haiku/{release_tag}/$(getarch)/current") self.ssh_root_check(f"pkgman add-repo -y https://eu.hpkg.haiku-os.org/haikuports/{release_tag}/$(getarch)/current") Note I used ssh_root_check() because the current script failed on a heavily loaded machine, since ssh_root() doesn't check for failure. Comments related to pre-existing issue, so: Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> I can send my suggestions as followup patches. Regards, Phil.
On 16/01/2023 09.30, Thomas Huth wrote: > The old Haiku VM based on Beta 3 does not work anymore since it > fails to install the additional packages now that Beta 4 has been > released. Thanks to Alexander von Gluck IV for providing a new > image based on Beta 4, we can now upgrade the test image in our > QEMU CI, too, to get this working again. > > Note that Haiku Beta 4 apparently finally fixed the issue with > the enumeration of the virtio-block devices (see the ticket at > https://dev.haiku-os.org/ticket/16512 ) - the tarball disk can > now be found at index 1 instead of index 0. I just noticed that we should now remove the related comment, too: diff a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 --- a/tests/vm/haiku.x86_64 +++ b/tests/vm/haiku.x86_64 @@ -80,7 +80,6 @@ class HaikuVM(basevm.BaseVM): "ninja", ] - # https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (reversed order) BUILD_SCRIPT = """ set -e; rm -rf /tmp/qemu-test.*
diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 index 29668bc272..8b0d1b8954 100755 --- a/tests/vm/haiku.x86_64 +++ b/tests/vm/haiku.x86_64 @@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM): name = "haiku" arch = "x86_64" - link = "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/versions/20220216/providers/libvirt.box" - csum = "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d5041" + link = "https://app.vagrantup.com/haiku-os/boxes/r1beta4-x86_64/versions/20230114/providers/libvirt.box" + csum = "6e72a2a470e03dbc3c5e808664e057bb4022b390dca88e4c7da6188f26f6a3c9" poweroff = "shutdown" @@ -86,7 +86,7 @@ class HaikuVM(basevm.BaseVM): rm -rf /tmp/qemu-test.* cd $(mktemp -d /tmp/qemu-test.XXXXXX); mkdir src build; cd src; - tar -xf /dev/disk/virtual/virtio_block/0/raw; + tar -xf /dev/disk/virtual/virtio_block/1/raw; mkdir -p /usr/bin ln -s /boot/system/bin/env /usr/bin/env cd ../build
The old Haiku VM based on Beta 3 does not work anymore since it fails to install the additional packages now that Beta 4 has been released. Thanks to Alexander von Gluck IV for providing a new image based on Beta 4, we can now upgrade the test image in our QEMU CI, too, to get this working again. Note that Haiku Beta 4 apparently finally fixed the issue with the enumeration of the virtio-block devices (see the ticket at https://dev.haiku-os.org/ticket/16512 ) - the tarball disk can now be found at index 1 instead of index 0. Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/vm/haiku.x86_64 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)