1. Patchew
  2. QEMU
  3. View series

[PATCH] .gitlab-ci.d/cirrus: Drop the CI job for compiling with FreeBSD 12

Thomas Huth posted 1 patch 1 year ago
Failed in applying to current master (apply log)
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>
.gitlab-ci.d/cirrus.yml             | 13 -------------
.gitlab-ci.d/cirrus/freebsd-12.vars | 16 ----------------
tests/lcitool/refresh               |  1 -
3 files changed, 30 deletions(-)
delete mode 100644 .gitlab-ci.d/cirrus/freebsd-12.vars
[PATCH] .gitlab-ci.d/cirrus: Drop the CI job for compiling with FreeBSD 12
Posted by Thomas Huth 1 year ago 
FreeBSD 13.0 has been released in April 2021:

 https://www.freebsd.org/releases/13.0R/announce/

According to QEMU's support policy, we stop supporting the previous
major release two years after the the new major release has been
published. So we can stop testing FreeBSD 12 in our CI now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 We should likely also update tests/vm/freebsd ... however, FreeBSD 13
 seems not to use the serial console by default anymore, so I've got
 no clue how we could use their images now... Does anybody have any
 suggestions?

 .gitlab-ci.d/cirrus.yml             | 13 -------------
 .gitlab-ci.d/cirrus/freebsd-12.vars | 16 ----------------
 tests/lcitool/refresh               |  1 -
 3 files changed, 30 deletions(-)
 delete mode 100644 .gitlab-ci.d/cirrus/freebsd-12.vars

diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
index 502dfd612c..1507c928e5 100644
--- a/.gitlab-ci.d/cirrus.yml
+++ b/.gitlab-ci.d/cirrus.yml
@@ -44,19 +44,6 @@
   variables:
     QEMU_JOB_CIRRUS: 1
 
-x64-freebsd-12-build:
-  extends: .cirrus_build_job
-  variables:
-    NAME: freebsd-12
-    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
-    CIRRUS_VM_IMAGE_SELECTOR: image_family
-    CIRRUS_VM_IMAGE_NAME: freebsd-12-4
-    CIRRUS_VM_CPUS: 8
-    CIRRUS_VM_RAM: 8G
-    UPDATE_COMMAND: pkg update; pkg upgrade -y
-    INSTALL_COMMAND: pkg install -y
-    TEST_TARGETS: check
-
 x64-freebsd-13-build:
   extends: .cirrus_build_job
   variables:
diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars
deleted file mode 100644
index 44d8a2a511..0000000000
--- a/.gitlab-ci.d/cirrus/freebsd-12.vars
+++ /dev/null
@@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool variables freebsd-12 qemu
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-CCACHE='/usr/local/bin/ccache'
-CPAN_PKGS=''
-CROSS_PKGS=''
-MAKE='/usr/local/bin/gmake'
-NINJA='/usr/local/bin/ninja'
-PACKAGING_COMMAND='pkg'
-PIP3='/usr/local/bin/pip-3.8'
-PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 zstd'
-PYPI_PKGS=''
-PYTHON='/usr/local/bin/python3'
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index c0d7ad5516..4c568242d2 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -182,7 +182,6 @@ try:
     #
     # Cirrus packages lists for GitLab
     #
-    generate_cirrus("freebsd-12")
     generate_cirrus("freebsd-13")
     generate_cirrus("macos-12")
 
-- 
2.31.1
Re: [PATCH] .gitlab-ci.d/cirrus: Drop the CI job for compiling with FreeBSD 12
Posted by Warner Losh 1 year ago 
On Tue, Apr 18, 2023 at 10:02 AM Thomas Huth <thuth@redhat.com> wrote:

> FreeBSD 13.0 has been released in April 2021:
>
>  https://www.freebsd.org/releases/13.0R/announce/
>
> According to QEMU's support policy, we stop supporting the previous
> major release two years after the the new major release has been
> published. So we can stop testing FreeBSD 12 in our CI now.
>

13.2 was just released this week, and the FreeBSD project will be
dropping support for 12 by the end of the year. 14.0 is up in late
string / early summer.


> Signed-off-by: Thomas Huth <thuth@redhat.com>
>

Reviewed-by: Warner Losh <imp@bsdimp.com>


> ---
>  We should likely also update tests/vm/freebsd ... however, FreeBSD 13
>  seems not to use the serial console by default anymore, so I've got
>  no clue how we could use their images now... Does anybody have any
>  suggestions?
>

I should look at this... It should still be using serial console by
default...

Warner


>  .gitlab-ci.d/cirrus.yml             | 13 -------------
>  .gitlab-ci.d/cirrus/freebsd-12.vars | 16 ----------------
>  tests/lcitool/refresh               |  1 -
>  3 files changed, 30 deletions(-)
>  delete mode 100644 .gitlab-ci.d/cirrus/freebsd-12.vars
>
> diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
> index 502dfd612c..1507c928e5 100644
> --- a/.gitlab-ci.d/cirrus.yml
> +++ b/.gitlab-ci.d/cirrus.yml
> @@ -44,19 +44,6 @@
>    variables:
>      QEMU_JOB_CIRRUS: 1
>
> -x64-freebsd-12-build:
> -  extends: .cirrus_build_job
> -  variables:
> -    NAME: freebsd-12
> -    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
> -    CIRRUS_VM_IMAGE_SELECTOR: image_family
> -    CIRRUS_VM_IMAGE_NAME: freebsd-12-4
> -    CIRRUS_VM_CPUS: 8
> -    CIRRUS_VM_RAM: 8G
> -    UPDATE_COMMAND: pkg update; pkg upgrade -y
> -    INSTALL_COMMAND: pkg install -y
> -    TEST_TARGETS: check
> -
>  x64-freebsd-13-build:
>    extends: .cirrus_build_job
>    variables:
> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars
> b/.gitlab-ci.d/cirrus/freebsd-12.vars
> deleted file mode 100644
> index 44d8a2a511..0000000000
> --- a/.gitlab-ci.d/cirrus/freebsd-12.vars
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -# THIS FILE WAS AUTO-GENERATED
> -#
> -#  $ lcitool variables freebsd-12 qemu
> -#
> -# https://gitlab.com/libvirt/libvirt-ci
> -
> -CCACHE='/usr/local/bin/ccache'
> -CPAN_PKGS=''
> -CROSS_PKGS=''
> -MAKE='/usr/local/bin/gmake'
> -NINJA='/usr/local/bin/ninja'
> -PACKAGING_COMMAND='pkg'
> -PIP3='/usr/local/bin/pip-3.8'
> -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache
> cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex
> fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi
> libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1
> llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy
> py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3
> rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract
> usbredir virglrenderer vte3 zstd'
> -PYPI_PKGS=''
> -PYTHON='/usr/local/bin/python3'
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index c0d7ad5516..4c568242d2 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -182,7 +182,6 @@ try:
>      #
>      # Cirrus packages lists for GitLab
>      #
> -    generate_cirrus("freebsd-12")
>      generate_cirrus("freebsd-13")
>      generate_cirrus("macos-12")
>
> --
> 2.31.1
>
>
Re: [PATCH] .gitlab-ci.d/cirrus: Drop the CI job for compiling with FreeBSD 12
Posted by Thomas Huth 1 year ago 
On 18/04/2023 21.46, Warner Losh wrote:
> 
> 
> On Tue, Apr 18, 2023 at 10:02 AM Thomas Huth <thuth@redhat.com 
> <mailto:thuth@redhat.com>> wrote:
> 
>     FreeBSD 13.0 has been released in April 2021:
> 
>     https://www.freebsd.org/releases/13.0R/announce/
>     <https://www.freebsd.org/releases/13.0R/announce/>
> 
>     According to QEMU's support policy, we stop supporting the previous
>     major release two years after the the new major release has been
>     published. So we can stop testing FreeBSD 12 in our CI now.
> 
> 
> 13.2 was just released this week, and the FreeBSD project will be
> dropping support for 12 by the end of the year. 14.0 is up in late
> string / early summer.
> 
>     Signed-off-by: Thomas Huth <thuth@redhat.com <mailto:thuth@redhat.com>>
> 
> 
> Reviewed-by: Warner Losh <imp@bsdimp.com <mailto:imp@bsdimp.com>>
> 
>     ---
>       We should likely also update tests/vm/freebsd ... however, FreeBSD 13
>       seems not to use the serial console by default anymore, so I've got
>       no clue how we could use their images now... Does anybody have any
>       suggestions?
> 
> 
> I should look at this... It should still be using serial console by default...

I did some more tests ... looks like both 
FreeBSD-13.2-RELEASE-amd64-disc1.iso and FreeBSD-13.2-RELEASE-amd64.qcow2 
have serial (and ssh) disabled by default - but there is a 
FreeBSD-13.2-RELEASE-amd64-BASIC-CI.raw image now that has the serial 
console (and ssh) enabled by default, so I think we could use that one for 
our CI tests.

  Thomas
Re: [PATCH] .gitlab-ci.d/cirrus: Drop the CI job for compiling with FreeBSD 12
Posted by Warner Losh 1 year ago 
On Wed, Apr 19, 2023, 12:23 AM Thomas Huth <thuth@redhat.com> wrote:

> On 18/04/2023 21.46, Warner Losh wrote:
> >
> >
> > On Tue, Apr 18, 2023 at 10:02 AM Thomas Huth <thuth@redhat.com
> > <mailto:thuth@redhat.com>> wrote:
> >
> >     FreeBSD 13.0 has been released in April 2021:
> >
> >     https://www.freebsd.org/releases/13.0R/announce/
> >     <https://www.freebsd.org/releases/13.0R/announce/>
> >
> >     According to QEMU's support policy, we stop supporting the previous
> >     major release two years after the the new major release has been
> >     published. So we can stop testing FreeBSD 12 in our CI now.
> >
> >
> > 13.2 was just released this week, and the FreeBSD project will be
> > dropping support for 12 by the end of the year. 14.0 is up in late
> > string / early summer.
> >
> >     Signed-off-by: Thomas Huth <thuth@redhat.com <mailto:
> thuth@redhat.com>>
> >
> >
> > Reviewed-by: Warner Losh <imp@bsdimp.com <mailto:imp@bsdimp.com>>
> >
> >     ---
> >       We should likely also update tests/vm/freebsd ... however, FreeBSD
> 13
> >       seems not to use the serial console by default anymore, so I've got
> >       no clue how we could use their images now... Does anybody have any
> >       suggestions?
> >
> >
> > I should look at this... It should still be using serial console by
> default...
>
> I did some more tests ... looks like both
> FreeBSD-13.2-RELEASE-amd64-disc1.iso and FreeBSD-13.2-RELEASE-amd64.qcow2
> have serial (and ssh) disabled by default - but there is a
> FreeBSD-13.2-RELEASE-amd64-BASIC-CI.raw image now that has the serial
> console (and ssh) enabled by default, so I think we could use that one for
> our CI tests.
>

I'm surprised a little by this state and will see why and see if that can't
be fixed for 14.0.

Warner

  Thomas
>
>
Re: [PATCH] .gitlab-ci.d/cirrus: Drop the CI job for compiling with FreeBSD 12
Posted by Alex Bennée 1 year ago 
Thomas Huth <thuth@redhat.com> writes:

> FreeBSD 13.0 has been released in April 2021:
>
>  https://www.freebsd.org/releases/13.0R/announce/
>
> According to QEMU's support policy, we stop supporting the previous
> major release two years after the the new major release has been
> published. So we can stop testing FreeBSD 12 in our CI now.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Queued to testing/next, thanks.

> ---
>  We should likely also update tests/vm/freebsd ... however, FreeBSD 13
>  seems not to use the serial console by default anymore, so I've got
>  no clue how we could use their images now... Does anybody have any
>  suggestions?

Don't we have ssh support for all the test/vm images?

>
>  .gitlab-ci.d/cirrus.yml             | 13 -------------
>  .gitlab-ci.d/cirrus/freebsd-12.vars | 16 ----------------
>  tests/lcitool/refresh               |  1 -
>  3 files changed, 30 deletions(-)
>  delete mode 100644 .gitlab-ci.d/cirrus/freebsd-12.vars
>
> diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
> index 502dfd612c..1507c928e5 100644
> --- a/.gitlab-ci.d/cirrus.yml
> +++ b/.gitlab-ci.d/cirrus.yml
> @@ -44,19 +44,6 @@
>    variables:
>      QEMU_JOB_CIRRUS: 1
>  
> -x64-freebsd-12-build:
> -  extends: .cirrus_build_job
> -  variables:
> -    NAME: freebsd-12
> -    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
> -    CIRRUS_VM_IMAGE_SELECTOR: image_family
> -    CIRRUS_VM_IMAGE_NAME: freebsd-12-4
> -    CIRRUS_VM_CPUS: 8
> -    CIRRUS_VM_RAM: 8G
> -    UPDATE_COMMAND: pkg update; pkg upgrade -y
> -    INSTALL_COMMAND: pkg install -y
> -    TEST_TARGETS: check
> -
>  x64-freebsd-13-build:
>    extends: .cirrus_build_job
>    variables:
> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars
> deleted file mode 100644
> index 44d8a2a511..0000000000
> --- a/.gitlab-ci.d/cirrus/freebsd-12.vars
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -# THIS FILE WAS AUTO-GENERATED
> -#
> -#  $ lcitool variables freebsd-12 qemu
> -#
> -# https://gitlab.com/libvirt/libvirt-ci
> -
> -CCACHE='/usr/local/bin/ccache'
> -CPAN_PKGS=''
> -CROSS_PKGS=''
> -MAKE='/usr/local/bin/gmake'
> -NINJA='/usr/local/bin/ninja'
> -PACKAGING_COMMAND='pkg'
> -PIP3='/usr/local/bin/pip-3.8'
> -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 zstd'
> -PYPI_PKGS=''
> -PYTHON='/usr/local/bin/python3'
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index c0d7ad5516..4c568242d2 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -182,7 +182,6 @@ try:
>      #
>      # Cirrus packages lists for GitLab
>      #
> -    generate_cirrus("freebsd-12")
>      generate_cirrus("freebsd-13")
>      generate_cirrus("macos-12")


-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.