[libvirt PATCH 0/2] Fix the failing FreeBSD 13.1 CI build job
failing CI job reference: https://gitlab.com/libvirt/libvirt/-/jobs/4880861477 Even though 13.1 has been marked as EOL and we are rightfully permitted to bump the version, we can't/shouldn't fix this directly in lcitool just yet, because libosinfo hasn't caught up on this fact yet and if we just bumped the cirrus version in the lcitool target OS config without updating the libosinfo ID we'd create a consistency problem. However, thanks to Paolo Bonzini's work on lcitool we have an easy workaround fix at hand where we can override many data-related things in lcitool. Erik Skultety (2): ci: Introduce a new 'lcitool' data directory ci: Udate FreeBSD-13 image with lcitool manifest ci/gitlab/builds.yml | 2 +- ci/lcitool/targets/freebsd-13.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 ci/lcitool/targets/freebsd-13.yml -- 2.41.0
We've reached a point in lcitool where we can't steer its development based solely on libvirt's needs IOW there will be times where a local override of value (e.g. package mapping) will be necessary - an example of this would be QEMU. In case of this particular patch we need to add an override for the cirrus FreeBSD 13 image we request in our CI to fix: /usr/local/lib/libtasn1.so.6: Undefined symbol "strverscmp@FBSD_1.7" The reason why we can't/should not make the fix in upstream lcitool just yet is that we store a libosinfo ID in lcitool's OS target YAML configs and at the time of writing this patch libosinfo does not have a corresponding entry/ID for FreeBSD 13.2 so we have to stick with 13.1 in lcitool until they do so. For the time being, the fix can easily be done on libvirt side as does this patch. Signed-off-by: Erik Skultety <eskultet@redhat.com> --- ci/lcitool/targets/freebsd-13.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 ci/lcitool/targets/freebsd-13.yml diff --git a/ci/lcitool/targets/freebsd-13.yml b/ci/lcitool/targets/freebsd-13.yml new file mode 100644 index 0000000000..0337926479 --- /dev/null +++ b/ci/lcitool/targets/freebsd-13.yml @@ -0,0 +1,2 @@ +cirrus: + image_name: freebsd-13-2 -- 2.41.0
Now that we have a local OS target override for lcitool in place, we can bump the cirrus FreeBSD image version in GitLab CI. Signed-off-by: Erik Skultety <eskultet@redhat.com> --- ci/gitlab/builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index f4e67b363e..596d4f9fee 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -851,7 +851,7 @@ x86_64-freebsd-13: needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: freebsd-13-1 + CIRRUS_VM_IMAGE_NAME: freebsd-13-2 CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_INSTANCE_TYPE: freebsd_instance INSTALL_COMMAND: pkg install -y -- 2.41.0
On Wed, Aug 16, 2023 at 10:52:34AM +0200, Erik Skultety wrote:
failing CI job reference: https://gitlab.com/libvirt/libvirt/-/jobs/4880861477
Even though 13.1 has been marked as EOL and we are rightfully permitted to bump the version, we can't/shouldn't fix this directly in lcitool just yet, because libosinfo hasn't caught up on this fact yet and if we just bumped the cirrus version in the lcitool target OS config without updating the libosinfo ID we'd create a consistency problem. However, thanks to Paolo Bonzini's work on lcitool we have an easy workaround fix at hand where we can override many data-related things in lcitool.
Forgot to mention one important fact: After patch 1 a plain '$ lcitool manifest' won't be enough to pick up the overrides from the ci/lcitool data directory. Instead, '$ lcitool -d ci/lcitool manifest' will be needed for a correct lcitool manifest refresh. Erik
Erik Skultety (2): ci: Introduce a new 'lcitool' data directory ci: Udate FreeBSD-13 image with lcitool manifest
ci/gitlab/builds.yml | 2 +- ci/lcitool/targets/freebsd-13.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 ci/lcitool/targets/freebsd-13.yml
-- 2.41.0
On 8/16/23 10:52, Erik Skultety wrote:
failing CI job reference: https://gitlab.com/libvirt/libvirt/-/jobs/4880861477
Even though 13.1 has been marked as EOL and we are rightfully permitted to bump the version, we can't/shouldn't fix this directly in lcitool just yet, because libosinfo hasn't caught up on this fact yet and if we just bumped the cirrus version in the lcitool target OS config without updating the libosinfo ID we'd create a consistency problem. However, thanks to Paolo Bonzini's work on lcitool we have an easy workaround fix at hand where we can override many data-related things in lcitool.
Erik Skultety (2): ci: Introduce a new 'lcitool' data directory ci: Udate FreeBSD-13 image with lcitool manifest
ci/gitlab/builds.yml | 2 +- ci/lcitool/targets/freebsd-13.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 ci/lcitool/targets/freebsd-13.yml
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
participants (2)
-
Erik Skultety -
Michal Prívozník