| Message ID | Y5GJpW/1s+NEah98@humpty.home.comstyle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | FreeBSD: Upgrade to 12.4 release | expand |
On 8/12/22 07:52, Brad Smith wrote: > FreeBSD: Upgrade to 12.4 release > > Signed-off-by: Brad Smith <brad@comstyle.com> > --- > .gitlab-ci.d/cirrus.yml | 2 +- > tests/vm/freebsd | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml > index 634a73a742..785b163aa6 100644 > --- a/.gitlab-ci.d/cirrus.yml > +++ b/.gitlab-ci.d/cirrus.yml > @@ -50,7 +50,7 @@ x64-freebsd-12-build: > NAME: freebsd-12 > CIRRUS_VM_INSTANCE_TYPE: freebsd_instance > CIRRUS_VM_IMAGE_SELECTOR: image_family > - CIRRUS_VM_IMAGE_NAME: freebsd-12-3 > + CIRRUS_VM_IMAGE_NAME: freebsd-12-4 > CIRRUS_VM_CPUS: 8 > CIRRUS_VM_RAM: 8G > UPDATE_COMMAND: pkg update > diff --git a/tests/vm/freebsd b/tests/vm/freebsd > index d6ff4461ba..ba2ba23d24 100755 > --- a/tests/vm/freebsd > +++ b/tests/vm/freebsd > @@ -28,8 +28,8 @@ class FreeBSDVM(basevm.BaseVM): > name = "freebsd" > arch = "x86_64" > > - link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.3/FreeBSD-12.3-RELEASE-amd64-disc1.iso.xz" > - csum = "36dd0de50f1fe5f0a88e181e94657656de26fb64254412f74e80e128e8b938b4" > + link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.4/FreeBSD-12.4-RELEASE-amd64-disc1.iso.xz" > + csum = "1dcf6446e31bf3f81b582e9aba3319a258c29a937a2af6138ee4b181ed719a87" I don't remember and wonder why we don't use the pre-populated image: https://download.freebsd.org/ftp/releases/VM-IMAGES/12.4-RELEASE/amd64/Latest/FreeBSD-12.4-RELEASE-amd64.qcow2.xz Anyhow, Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On Thu, Dec 8, 2022 at 12:47 AM Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > On 8/12/22 07:52, Brad Smith wrote: > > FreeBSD: Upgrade to 12.4 release > > > > Signed-off-by: Brad Smith <brad@comstyle.com> > > --- > > .gitlab-ci.d/cirrus.yml | 2 +- > > tests/vm/freebsd | 4 ++-- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml > > index 634a73a742..785b163aa6 100644 > > --- a/.gitlab-ci.d/cirrus.yml > > +++ b/.gitlab-ci.d/cirrus.yml > > @@ -50,7 +50,7 @@ x64-freebsd-12-build: > > NAME: freebsd-12 > > CIRRUS_VM_INSTANCE_TYPE: freebsd_instance > > CIRRUS_VM_IMAGE_SELECTOR: image_family > > - CIRRUS_VM_IMAGE_NAME: freebsd-12-3 > > + CIRRUS_VM_IMAGE_NAME: freebsd-12-4 > > CIRRUS_VM_CPUS: 8 > > CIRRUS_VM_RAM: 8G > > UPDATE_COMMAND: pkg update > > diff --git a/tests/vm/freebsd b/tests/vm/freebsd > > index d6ff4461ba..ba2ba23d24 100755 > > --- a/tests/vm/freebsd > > +++ b/tests/vm/freebsd > > @@ -28,8 +28,8 @@ class FreeBSDVM(basevm.BaseVM): > > name = "freebsd" > > arch = "x86_64" > > > > - link = " > https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.3/FreeBSD-12.3-RELEASE-amd64-disc1.iso.xz > " > > - csum = > "36dd0de50f1fe5f0a88e181e94657656de26fb64254412f74e80e128e8b938b4" > > + link = " > https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.4/FreeBSD-12.4-RELEASE-amd64-disc1.iso.xz > " > > + csum = > "1dcf6446e31bf3f81b582e9aba3319a258c29a937a2af6138ee4b181ed719a87" > > I don't remember and wonder why we don't use the pre-populated image: > > https://download.freebsd.org/ftp/releases/VM-IMAGES/12.4-RELEASE/amd64/Latest/FreeBSD-12.4-RELEASE-amd64.qcow2.xz QEMU's CI pre-dates the FreeBSD project producing those images. I don't think there's a big technical reason to not use them, though some of the scripting would need to change (mostly, I think, to delete things, and maybe to more-directly change config files to effect some of the settings done via the installer). > Anyhow, > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed by: Warner Losh <imp@bsdimp.com>
On 08/12/2022 07.52, Brad Smith wrote: > FreeBSD: Upgrade to 12.4 release > > Signed-off-by: Brad Smith <brad@comstyle.com> > --- > .gitlab-ci.d/cirrus.yml | 2 +- > tests/vm/freebsd | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Thanks, queued to my testing-next branch: https://gitlab.com/thuth/qemu/-/commits/testing-next/ Thomas
diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 634a73a742..785b163aa6 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -50,7 +50,7 @@ x64-freebsd-12-build: NAME: freebsd-12 CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_IMAGE_NAME: freebsd-12-3 + CIRRUS_VM_IMAGE_NAME: freebsd-12-4 CIRRUS_VM_CPUS: 8 CIRRUS_VM_RAM: 8G UPDATE_COMMAND: pkg update diff --git a/tests/vm/freebsd b/tests/vm/freebsd index d6ff4461ba..ba2ba23d24 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -28,8 +28,8 @@ class FreeBSDVM(basevm.BaseVM): name = "freebsd" arch = "x86_64" - link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.3/FreeBSD-12.3-RELEASE-amd64-disc1.iso.xz" - csum = "36dd0de50f1fe5f0a88e181e94657656de26fb64254412f74e80e128e8b938b4" + link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.4/FreeBSD-12.4-RELEASE-amd64-disc1.iso.xz" + csum = "1dcf6446e31bf3f81b582e9aba3319a258c29a937a2af6138ee4b181ed719a87" size = "20G" pkgs = [ # build tools
FreeBSD: Upgrade to 12.4 release Signed-off-by: Brad Smith <brad@comstyle.com> --- .gitlab-ci.d/cirrus.yml | 2 +- tests/vm/freebsd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)