- Devel - libvirt List Archives

[PATCH] libvirt-guests.sh: fix log output with new systemd
by Christian Ehrhardt 30 Apr '20

30 Apr '20

Newer systemd is too smart, it detects the PIDs of the gettext calls and due to that a log lists libvirt-guests.sh with many different PIDs. Furthermore it struggles to collect the output in time, so it can be truncated and overall looks like: libvirt-guests.sh[37986]: Running guests on default URI: libvirt-guests.sh[37995]: Running guests on libvirt-guests.sh[37977]: R Gather the gettext result into a local variable and printing the value from libvirt-guests.sh itself fixes both issues. Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1875708 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- tools/libvirt-guests.sh.in | 74 +++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 7af24dab3b..324abe3623 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -28,6 +28,16 @@ test ! -r "$sysconfdir"/rc.d/init.d/functions || # Make sure this file is recognized as having translations: _("dummy") . "@bindir@"/gettext.sh +# Avoid output being listed under gettext PID and being truncated +unbuffered_gettext () { + msg="$(gettext "$1")" + echo "$msg" +} +unbuffered_eval_gettext () { + msg="$(eval_gettext "$1")" + echo "$msg" +} + export TEXTDOMAIN="@PACKAGE@" TEXTDOMAINDIR="@localedir@" URIS=default @@ -91,7 +101,7 @@ test_connect() if run_virsh "$uri" connect 2>/dev/null; then return 0; else - eval_gettext "Can't connect to \$uri. Skipping." + unbuffered_eval_gettext "Can't connect to \$uri. Skipping." return 1 fi } @@ -160,7 +170,7 @@ start() { [ -f "$LISTFILE" ] || { started; return 0; } if [ "x$ON_BOOT" != xstart ]; then - gettext "libvirt-guests is configured not to start any guests on boot" + unbuffered_gettext "libvirt-guests is configured not to start any guests on boot" echo rm -f "$LISTFILE" started @@ -184,19 +194,19 @@ start() { done set +f if ! "$configured"; then - eval_gettext "Ignoring guests on \$uri URI"; echo + unbuffered_eval_gettext "Ignoring guests on \$uri URI"; echo continue fi test_connect "$uri" || continue - eval_gettext "Resuming guests on \$uri URI..."; echo + unbuffered_eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do local name=$(guest_name "$uri" "$guest") - eval_gettext "Resuming guest \$name: " + unbuffered_eval_gettext "Resuming guest \$name: " if guest_is_on "$uri" "$guest"; then if "$guest_running"; then - gettext "already active"; echo + unbuffered_gettext "already active"; echo else if "$isfirst"; then isfirst=false @@ -205,7 +215,7 @@ start() { fi retval run_virsh "$uri" start $bypass "$name" \ >/dev/null && \ - gettext "done"; echo + unbuffered_gettext "done"; echo if "$sync_time"; then run_virsh "$uri" domtime --sync "$name" >/dev/null fi @@ -226,7 +236,7 @@ suspend_guest() local uri=$1 local guest=$2 local name=$(guest_name "$uri" "$guest") - local label=$(eval_gettext "Suspending \$name: ") + local label=$(unbuffered_eval_gettext "Suspending \$name: ") local bypass= local slept=0 @@ -249,7 +259,7 @@ suspend_guest() fi fi done - retval wait "$virsh_pid" && printf '%s%s\n' "$label" "$(gettext "done")" + retval wait "$virsh_pid" && printf '%s%s\n' "$label" "$(unbuffered_gettext "done")" } # shutdown_guest URI GUEST @@ -265,16 +275,16 @@ shutdown_guest() local format= local slept= - eval_gettext "Starting shutdown on guest: \$name" + unbuffered_eval_gettext "Starting shutdown on guest: \$name" echo retval run_virsh "$uri" shutdown "$guest" >/dev/null || return if [ $timeout -gt 0 ]; then check_timeout=true - format=$(eval_gettext "Waiting for guest %s to shut down, %d seconds left\n") + format=$(unbuffered_eval_gettext "Waiting for guest %s to shut down, %d seconds left\n") else slept=0 - format=$(eval_gettext "Waiting for guest %s to shut down\n") + format=$(unbuffered_eval_gettext "Waiting for guest %s to shut down\n") fi while ! $check_timeout || [ "$timeout" -gt 0 ]; do sleep 1 @@ -296,9 +306,9 @@ shutdown_guest() if guest_is_on "$uri" "$guest"; then if "$guest_running"; then - eval_gettext "Shutdown of guest \$name failed to complete in time." + unbuffered_eval_gettext "Shutdown of guest \$name failed to complete in time." else - eval_gettext "Shutdown of guest \$name complete." + unbuffered_eval_gettext "Shutdown of guest \$name complete." fi echo fi @@ -313,7 +323,7 @@ shutdown_guest_async() local guest=$2 local name=$(guest_name "$uri" "$guest") - eval_gettext "Starting shutdown on guest: \$name" + unbuffered_eval_gettext "Starting shutdown on guest: \$name" echo retval run_virsh "$uri" shutdown "$guest" > /dev/null } @@ -339,7 +349,7 @@ check_guests_shutdown() guests_shutting_down= for guest in $guests_to_check; do if ! guest_is_on "$uri" "$guest" >/dev/null 2>&1; then - eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." + unbuffered_eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." echo continue fi @@ -366,7 +376,7 @@ print_guests_shutdown() local name=$(guest_name "$uri" "$guest") if [ -n "$name" ]; then - eval_gettext "Shutdown of guest \$name complete." + unbuffered_eval_gettext "Shutdown of guest \$name complete." echo fi done @@ -386,10 +396,10 @@ shutdown_guests_parallel() if [ $timeout -gt 0 ]; then check_timeout=true - format=$(eval_gettext "Waiting for %d guests to shut down, %d seconds left\n") + format=$(unbuffered_eval_gettext "Waiting for %d guests to shut down, %d seconds left\n") else slept=0 - format=$(eval_gettext "Waiting for %d guests to shut down\n") + format=$(unbuffered_eval_gettext "Waiting for %d guests to shut down\n") fi while [ -n "$on_shutdown" ] || [ -n "$guests" ]; do while [ -n "$guests" ] && @@ -417,7 +427,7 @@ shutdown_guests_parallel() fi timeout=$(($timeout - 1)) if [ $timeout -le 0 ]; then - eval_gettext "Timeout expired while shutting down domains"; echo + unbuffered_eval_gettext "Timeout expired while shutting down domains"; echo RETVAL=1 return fi @@ -447,7 +457,7 @@ stop() { if [ "/x$ON_SHUTDOWN" = xshutdown ]; then suspending=false if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then - gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" + unbuffered_gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" echo RETVAL=6 return @@ -461,7 +471,7 @@ stop() { test_connect "$uri" || continue - eval_gettext "Running guests on \$uri URI: " + unbuffered_eval_gettext "Running guests on \$uri URI: " local list=$(list_guests "$uri") if [ $? -eq 0 ]; then @@ -473,7 +483,7 @@ stop() { done if "$empty"; then - gettext "no running guests." + unbuffered_gettext "no running guests." fi echo fi @@ -486,7 +496,7 @@ stop() { for uuid in $transient; do if "$empty"; then - eval_gettext "Not suspending transient guests on URI: \$uri: " + unbuffered_eval_gettext "Not suspending transient guests on URI: \$uri: " empty=false else printf ", " @@ -497,14 +507,14 @@ stop() { # reload domain list to contain only persistent guests list=$(list_guests "$uri" "--persistent") if [ $? -ne 0 ]; then - eval_gettext "Failed to list persistent guests on \$uri" + unbuffered_eval_gettext "Failed to list persistent guests on \$uri" echo RETVAL=1 set +f return fi else - gettext "Failed to list transient guests" + unbuffered_gettext "Failed to list transient guests" echo RETVAL=1 set +f @@ -521,9 +531,9 @@ stop() { if [ -s "$LISTFILE" ]; then while read uri list; do if "$suspending"; then - eval_gettext "Suspending guests on \$uri URI..."; echo + unbuffered_eval_gettext "Suspending guests on \$uri URI..."; echo else - eval_gettext "Shutting down guests on \$uri URI..."; echo + unbuffered_eval_gettext "Shutting down guests on \$uri URI..."; echo fi if [ "$PARALLEL_SHUTDOWN" -gt 1 ] && @@ -566,14 +576,14 @@ gueststatus() { # since there is no external daemon process matching this init script. rh_status() { if [ -f "$LISTFILE" ]; then - gettext "stopped, with saved guests"; echo + unbuffered_gettext "stopped, with saved guests"; echo RETVAL=3 else if [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ]; then - gettext "started"; echo + unbuffered_gettext "started"; echo RETVAL=0 else - gettext "stopped, with no saved guests"; echo + unbuffered_gettext "stopped, with no saved guests"; echo RETVAL=3 fi fi @@ -583,7 +593,7 @@ rh_status() { # Display usage string, then exit with VAL (defaults to 2). usage() { local program_name=$0 - eval_gettext "Usage: \$program_name {start|stop|status|restart|"\ + unbuffered_eval_gettext "Usage: \$program_name {start|stop|status|restart|"\ "condrestart|try-restart|reload|force-reload|gueststatus|shutdown}"; echo exit ${1-2} } -- 2.26.0

3 11

[libvirt-dockerfiles PATCH 0/4] Refresh after recent changes
by Andrea Bolognani 30 Apr '20

30 Apr '20

Pushed under the Dockerfile refresh rule. Andrea Bolognani (4): Remove Fedora 30 Remove Ubuntu 16.04 Refresh after installing python3-wheel Add new MinGW containers based on Fedora Rawhide buildenv-libosinfo-centos-7.zip | Bin 1782 -> 1790 bytes buildenv-libosinfo-centos-8.zip | Bin 716 -> 723 bytes buildenv-libosinfo-debian-10.zip | Bin 783 -> 790 bytes buildenv-libosinfo-debian-9.zip | Bin 804 -> 811 bytes buildenv-libosinfo-debian-sid.zip | Bin 783 -> 789 bytes ...denv-libosinfo-fedora-30-cross-mingw32.zip | Bin 754 -> 0 bytes ...denv-libosinfo-fedora-30-cross-mingw64.zip | Bin 757 -> 0 bytes buildenv-libosinfo-fedora-30.zip | Bin 668 -> 0 bytes buildenv-libosinfo-fedora-31.zip | Bin 668 -> 675 bytes ...libosinfo-fedora-rawhide-cross-mingw32.zip | Bin 0 -> 781 bytes ...libosinfo-fedora-rawhide-cross-mingw64.zip | Bin 0 -> 784 bytes buildenv-libosinfo-fedora-rawhide.zip | Bin 688 -> 694 bytes buildenv-libosinfo-opensuse-151.zip | Bin 694 -> 701 bytes buildenv-libosinfo-ubuntu-1604.zip | Bin 808 -> 0 bytes buildenv-libosinfo-ubuntu-1804.zip | Bin 808 -> 815 bytes buildenv-libvirt-centos-7.zip | Bin 2006 -> 2022 bytes buildenv-libvirt-centos-8.zip | Bin 928 -> 946 bytes buildenv-libvirt-debian-10-cross-aarch64.zip | Bin 1110 -> 1117 bytes buildenv-libvirt-debian-10-cross-armv6l.zip | Bin 1102 -> 1110 bytes buildenv-libvirt-debian-10-cross-armv7l.zip | Bin 1108 -> 1115 bytes buildenv-libvirt-debian-10-cross-i686.zip | Bin 1105 -> 1112 bytes buildenv-libvirt-debian-10-cross-mips.zip | Bin 1103 -> 1110 bytes buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 1114 -> 1121 bytes buildenv-libvirt-debian-10-cross-mipsel.zip | Bin 1105 -> 1113 bytes buildenv-libvirt-debian-10-cross-ppc64le.zip | Bin 1115 -> 1123 bytes buildenv-libvirt-debian-10-cross-s390x.zip | Bin 1105 -> 1112 bytes buildenv-libvirt-debian-10.zip | Bin 1032 -> 1039 bytes buildenv-libvirt-debian-9-cross-aarch64.zip | Bin 1143 -> 1150 bytes buildenv-libvirt-debian-9-cross-armv6l.zip | Bin 1134 -> 1142 bytes buildenv-libvirt-debian-9-cross-armv7l.zip | Bin 1140 -> 1147 bytes buildenv-libvirt-debian-9-cross-mips.zip | Bin 1134 -> 1141 bytes buildenv-libvirt-debian-9-cross-mips64el.zip | Bin 1145 -> 1152 bytes buildenv-libvirt-debian-9-cross-mipsel.zip | Bin 1137 -> 1146 bytes buildenv-libvirt-debian-9-cross-ppc64le.zip | Bin 1147 -> 1154 bytes buildenv-libvirt-debian-9-cross-s390x.zip | Bin 1137 -> 1144 bytes buildenv-libvirt-debian-9.zip | Bin 1063 -> 1069 bytes buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 1110 -> 1117 bytes buildenv-libvirt-debian-sid-cross-armv6l.zip | Bin 1102 -> 1110 bytes buildenv-libvirt-debian-sid-cross-armv7l.zip | Bin 1108 -> 1115 bytes buildenv-libvirt-debian-sid-cross-i686.zip | Bin 1104 -> 1112 bytes ...denv-libvirt-debian-sid-cross-mips64el.zip | Bin 1114 -> 1121 bytes buildenv-libvirt-debian-sid-cross-mipsel.zip | Bin 1102 -> 1109 bytes buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 1115 -> 1123 bytes buildenv-libvirt-debian-sid-cross-s390x.zip | Bin 1105 -> 1112 bytes buildenv-libvirt-debian-sid.zip | Bin 1032 -> 1039 bytes buildenv-libvirt-fedora-30-cross-mingw32.zip | Bin 1031 -> 0 bytes buildenv-libvirt-fedora-30-cross-mingw64.zip | Bin 1034 -> 0 bytes buildenv-libvirt-fedora-30.zip | Bin 904 -> 0 bytes buildenv-libvirt-fedora-31.zip | Bin 904 -> 910 bytes ...v-libvirt-fedora-rawhide-cross-mingw32.zip | Bin 0 -> 1057 bytes ...v-libvirt-fedora-rawhide-cross-mingw64.zip | Bin 0 -> 1060 bytes buildenv-libvirt-fedora-rawhide.zip | Bin 925 -> 929 bytes buildenv-libvirt-opensuse-151.zip | Bin 914 -> 920 bytes buildenv-libvirt-ubuntu-1604.zip | Bin 1069 -> 0 bytes buildenv-libvirt-ubuntu-1804.zip | Bin 1069 -> 1075 bytes 55 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 buildenv-libosinfo-fedora-30-cross-mingw32.zip delete mode 100644 buildenv-libosinfo-fedora-30-cross-mingw64.zip delete mode 100644 buildenv-libosinfo-fedora-30.zip create mode 100644 buildenv-libosinfo-fedora-rawhide-cross-mingw32.zip create mode 100644 buildenv-libosinfo-fedora-rawhide-cross-mingw64.zip delete mode 100644 buildenv-libosinfo-ubuntu-1604.zip delete mode 100644 buildenv-libvirt-fedora-30-cross-mingw32.zip delete mode 100644 buildenv-libvirt-fedora-30-cross-mingw64.zip delete mode 100644 buildenv-libvirt-fedora-30.zip create mode 100644 buildenv-libvirt-fedora-rawhide-cross-mingw32.zip create mode 100644 buildenv-libvirt-fedora-rawhide-cross-mingw64.zip delete mode 100644 buildenv-libvirt-ubuntu-1604.zip -- 2.25.4

1 6

[libvirt-appdev-guide-python PATCH] gitlab: introduce CI jobs for building content
by Daniel P. Berrangé 30 Apr '20

30 Apr '20

This generates the HTML docs using publican and publishes the result as an artifact which are then browseable online via GitLab pages. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 40 ++++++++++++++++++++++++++ Makefile | 7 +++-- ci/libvirt-fedora-32.Dockerfile | 50 +++++++++++++++++++++++++++++++++ ci/refresh | 17 +++++++++++ 4 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100755 ci/refresh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50dae92..0e48e12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,34 @@ stages: - prebuild + - containers + - docs + +.container_job_template: &container_job_definition + image: docker:stable + stage: containers + services: + - docker:dind + before_script: + - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest" + - export COMMON_TAG="$CI_REGISTRY/libvirt/libvirt-perl/ci-$NAME:latest" + - docker info + - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + script: + - docker pull "$TAG" || docker pull "$COMMON_TAG" || true + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/libvirt-$NAME.Dockerfile" ci + - docker push "$TAG" + after_script: + - docker logout + +.docs_job_template: &docs_job_definition + stage: docs + before_script: + - export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)" + script: + - git clone --depth 1 https://gitlab.com/libvirt/libvirt-publican.git brand + - $MAKE branddir=$PWD/brand + - mv tmp/en-US/html public # Check that all commits are signed-off for the DCO. # Skip on "libvirt" namespace, since we only need to run @@ -14,3 +42,15 @@ check-dco: except: variables: - $CI_PROJECT_NAMESPACE == 'libvirt' + +fedora-32-container: + <<: *container_job_definition + variables: + NAME: fedora-32 + +pages: + <<: *docs_job_definition + image: $CI_REGISTRY_IMAGE/ci-fedora-32:latest + artifacts: + paths: + - public diff --git a/Makefile b/Makefile index 85935a1..237961a 100644 --- a/Makefile +++ b/Makefile @@ -3,17 +3,18 @@ prefix=/usr datadir=$(prefix)/share pkgdatadir=$(datadir)/publican contentdir=$(pkgdatadir)/Common_Content +branddir=$(contentdir) all: html pdf html: - publican build --langs=en-US --formats=html --common_content=$(contentdir) + publican build --langs=en-US --formats=html --common_content=$(contentdir) --brand_dir=$(branddir) pdf: - publican build --langs=en-US --formats=pdf --common_content=$(contentdir) + publican build --langs=en-US --formats=pdf --common_content=$(contentdir) --brand_dir=$(branddir) rpm: - publican package --lang=en-US --binary --desktop --common_content=$(contentdir) + publican package --lang=en-US --binary --desktop --common_content=$(contentdir) --brand_dir=$(branddir) clean: publican clean --common_content=$(contentdir) diff --git a/ci/libvirt-fedora-32.Dockerfile b/ci/libvirt-fedora-32.Dockerfile new file mode 100644 index 0000000..8539d7d --- /dev/null +++ b/ci/libvirt-fedora-32.Dockerfile @@ -0,0 +1,50 @@ +FROM fedora:32 + +RUN dnf update -y && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + ccache \ + chrony \ + cppi \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glibc-devel \ + glibc-langpack-en \ + libtool \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconfig \ + publican \ + python3 \ + python3-setuptools \ + python3-wheel \ + rpm-build \ + screen \ + strace \ + sudo \ + vim && \ + dnf autoremove -y && \ + dnf clean all -y && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + +ENV LANG "en_US.UTF-8" + +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/refresh b/ci/refresh new file mode 100755 index 0000000..ce0c20a --- /dev/null +++ b/ci/refresh @@ -0,0 +1,17 @@ +#!/bin/sh + +if test -z "$1" +then + echo "syntax: $0 PATH-TO-LCITOOL" + exit 1 +fi + +LCITOOL=$1 + +if ! test -x "$LCITOOL" +then + echo "$LCITOOL is not executable" + exit 1 +fi + +$LCITOOL dockerfile libvirt-fedora-32 libvirt-publican > libvirt-fedora-32.Dockerfile -- 2.25.4

1 0

[libvirt-ci PATCH] lcitool: Calculate pkg_align properly
by Andrea Bolognani 30 Apr '20

30 Apr '20

In one instance, the alignment was incorrectly based on the name of the packaging format rather than that of the packaging command. Fixes: 6c6ed1b925a03ed4223231a932a85668ba4bf8d8 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. guests/lcitool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guests/lcitool b/guests/lcitool index abc87d2..ab3b95f 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -817,7 +817,7 @@ class Application: if cross_pkgs[package] is None: del cross_pkgs[package] - pkg_align = " \\\n" + (" " * len("RUN " + facts["packaging"]["format"] + " ")) + pkg_align = " \\\n" + (" " * len("RUN " + facts["packaging"]["command"] + " ")) pip_pkg_align = " \\\n" + (" " * len("RUN pip3 ")) varmap = {} -- 2.25.4

1 0

[RFC PATCH 0/3] Make use of deprecated QMP commands/fields more obvious
by Peter Krempa 30 Apr '20

30 Apr '20

This is based on top of the recent capabilities update: https://www.redhat.com/archives/libvir-list/2020-April/msg01490.html Whole series can be fetched by: git fetch https://gitlab.com/pipo.sk/libvirt.git deprecated-crash and requires a qemu which includes Markus' patches adding the -compat feature: https://lists.gnu.org/archive/html/qemu-devel/2020-03/msg05380.html Note that it was pushed partially, for convenience I'm providing a branch with the patches applied and rebased: git fetch https://gitlab.com/pipo.sk/qemu.git compat-deprecated The main idea is to add developers and other interested parties the ability to enable the -compat options to crash qemu in cases when deprecated QMP command is used and stop formating any deprecated response. The qemu code is not pushed yet and doesn't have any way to be detected but I want to query whether such feature makes sense for developers. Peter Krempa (3): qemu: capabilities: Introduce QEMU_CAPS_COMPAT_DEPRECATED qemu: conf: Add 'deprecated_debug' setting to qemu.conf qemu: command: Handle formatting of '-compat' options src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 11 +++++++++++ src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 16 ++++++++++++++++ src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 2 ++ src/qemu/test_libvirtd_qemu.aug.in | 1 + tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 + 9 files changed, 39 insertions(+) -- 2.26.2

3 6

[libvirt-ci PATCH 0/4] Add Ubuntu 20.04, drop Ubuntu 16.04
by Andrea Bolognani 30 Apr '20

30 Apr '20

Andrea Bolognani (4): guests: Add Ubuntu 20.04 Start building on Ubuntu 20.04 Stop building on Ubuntu 16.04 guests: Drop Ubuntu 16.04 guests/host_vars/libvirt-ubuntu-1604/docker.yml | 2 -- guests/host_vars/libvirt-ubuntu-1604/install.yml | 2 -- guests/host_vars/libvirt-ubuntu-2004/docker.yml | 2 ++ .../{libvirt-ubuntu-1604 => libvirt-ubuntu-2004}/main.yml | 3 ++- guests/inventory | 2 +- guests/playbooks/build/jobs/defaults.yml | 2 +- guests/playbooks/build/projects/libvirt-dbus.yml | 4 ++-- guests/playbooks/build/projects/libvirt-sandbox.yml | 2 +- guests/playbooks/build/projects/libvirt-tck.yml | 2 +- guests/playbooks/build/projects/libvirt.yml | 2 +- guests/playbooks/build/projects/virt-manager.yml | 4 +++- guests/vars/mappings.yml | 8 +------- jenkins/projects/libvirt-dbus.yaml | 3 +-- jenkins/projects/virt-manager.yaml | 2 +- 14 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 guests/host_vars/libvirt-ubuntu-1604/docker.yml delete mode 100644 guests/host_vars/libvirt-ubuntu-1604/install.yml create mode 100644 guests/host_vars/libvirt-ubuntu-2004/docker.yml rename guests/host_vars/{libvirt-ubuntu-1604 => libvirt-ubuntu-2004}/main.yml (94%) -- 2.25.4

2 7

[libvirt-ci PATCH 0/3] vault: Add Fedora 32, remove unused secrets
by Andrea Bolognani 30 Apr '20

30 Apr '20

Pushed under the unreviewable vault update rule. Andrea Bolognani (3): vault: Remove unused secrets vault: Add secret for Fedora 32 vault: Remove secret for Fedora 30 guests/vars/vault.yml | 100 +++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 59 deletions(-) -- 2.25.4

1 3

[libvirt-perl PATCH v3 0/3] gitlab: introduce CI coverage
by Daniel P. Berrangé 30 Apr '20

30 Apr '20

This series introduces CI jobs for the Perl binding, enabling the switch over to use of Merge Requests with pre-merge build validation. v1: https://www.redhat.com/archives/libvir-list/2020-April/msg01157.html v2: https://www.redhat.com/archives/libvir-list/2020-April/msg01408.html This is a different approach from v1, because we don't inherit from the main libvirt container images. Instead we use the libvirt-minimal project as a dependancy. The cost is that the container build stage is more expensive, but the main project build stage is cheaper. This is a net win because the container build stage is cached so is only a penalty the first time, or when the distro parent image has changes to pull in. It also makes the CI process of the binding more self-contained avoiding by avoiding a dep on the container image for libvirt. Daniel P. Berrangé (3): Build: bump min perl to 5.16.0 gitlab: add CI jobs for validating build across platforms gitlab: add a simple job that publishes the API docs as HTML .gitlab-ci.yml | 158 +++++++++++++++++++++++++++ Build.PL | 2 +- ci/README.rst | 12 ++ ci/libvirt-centos-7.Dockerfile | 97 ++++++++++++++++ ci/libvirt-centos-8.Dockerfile | 68 ++++++++++++ ci/libvirt-debian-10.Dockerfile | 68 ++++++++++++ ci/libvirt-debian-9.Dockerfile | 71 ++++++++++++ ci/libvirt-debian-sid.Dockerfile | 68 ++++++++++++ ci/libvirt-fedora-30.Dockerfile | 66 +++++++++++ ci/libvirt-fedora-31.Dockerfile | 66 +++++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 67 ++++++++++++ ci/libvirt-opensuse-151.Dockerfile | 66 +++++++++++ ci/libvirt-ubuntu-1604.Dockerfile | 71 ++++++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 71 ++++++++++++ ci/refresh | 22 ++++ 15 files changed, 972 insertions(+), 1 deletion(-) create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-30.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1604.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100755 ci/refresh -- 2.25.4

1 3

[libvirt-ci PATCH v2] guests: introduce libvirt+dist and libvirt+minimal projects
by Daniel P. Berrangé 30 Apr '20

30 Apr '20

The language bindings have traditionally built against a full libvirt, however, this is serious overkill because all they should really need most of the time is access to the main API, and the test driver if they want to run functional tests. The full libvirt build with virt drivers is only needed for integration testing which most bindings won't do. Thus this introduces a new project "libvirt+minimal" which lists the bare minimum dependencies required to build libvirt. Taking libvirt-perl as an example, if creating a container using the current "libvirt,libvirt-perl" project set, the result with 1.4 GB in size for Fedora 31. With the "libvirt+minimal,libvirt-perl" set, the size is just 777 MB. Some projects also wish to have the ability to build against the distro provided libvirt instead of the latest git master, and for this purpose a "libvirt+dist" project is defined which pulls in the package needed for building against the distro libvirt. Thus when building any downstream project there is now a choice of building it against "libvirt" (full git) or "libvirt+minimal" (minimal git) or "libvirt+dist" (prebuilt distro). The same can be added later for example "libvirt-perl+dist" to refer to the distro provided perl binding. In the lcitool dockerfile command, there is a check that the requested project is configured against the requested host. These new projects are not listed against any host, because we don't want them installed by default in the VMs. Thus the dockerfile check is no longer valid and is removed. Whomever is invoking lcitool knows what combination they want and whether it will work. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- In v2: - Use "+suffix" syntax for new projects - Rename new package to "libvirt" guests/lcitool | 7 ------- guests/vars/mappings.yml | 5 +++++ guests/vars/projects/libvirt+dist.yml | 3 +++ guests/vars/projects/libvirt+minimal.yml | 12 ++++++++++++ 4 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 guests/vars/projects/libvirt+dist.yml create mode 100644 guests/vars/projects/libvirt+minimal.yml diff --git a/guests/lcitool b/guests/lcitool index 0c89e13..abc87d2 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -1007,13 +1007,6 @@ class Application: for project in projects: if project.rfind("+mingw") >= 0: raise Exception("Obsolete syntax, please use --cross-arch") - if project not in facts["projects"]: - raise Exception( - "Host {} doesn't support project {}".format( - host, - project, - ) - ) varmap = self._dockerfile_build_varmap(facts, mappings, pip_mappings, projects, cross_arch) self._dockerfile_format(facts, cross_arch, varmap) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4a19fb4..9dcad46 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -450,6 +450,11 @@ mappings: rpm: libuuid-devel cross-policy-deb: foreign + libvirt: + rpm: libvirt-devel + deb: libvirt-dev + pkg: libvirt + libxml2: deb: libxml2-dev pkg: libxml2 diff --git a/guests/vars/projects/libvirt+dist.yml b/guests/vars/projects/libvirt+dist.yml new file mode 100644 index 0000000..1fc1b2c --- /dev/null +++ b/guests/vars/projects/libvirt+dist.yml @@ -0,0 +1,3 @@ +--- +packages: + - libvirt diff --git a/guests/vars/projects/libvirt+minimal.yml b/guests/vars/projects/libvirt+minimal.yml new file mode 100644 index 0000000..96335f2 --- /dev/null +++ b/guests/vars/projects/libvirt+minimal.yml @@ -0,0 +1,12 @@ +--- +packages: + - glib2 + - gnutls + - libnl3 + - libnlroute3 + - libtirpc + - libxml2 + - python3-docutils + - rpcgen + - xmllint + - xsltproc -- 2.25.4

2 1

[libvirt-ci PATCH 0/4] Add Fedora 32, drop Fedora 30
by Andrea Bolognani 30 Apr '20

30 Apr '20

Fedora 32 was released earlier this week, and Fedora 30 goes EOL the next one. Andrea Bolognani (4): guests: Add Fedora 32 Start building on Fedora 32 Stop building on Fedora 30 guests: Remove Fedora 30 guests/host_vars/libvirt-fedora-30/docker.yml | 2 - guests/host_vars/libvirt-fedora-32/docker.yml | 2 + .../install.yml | 2 +- .../main.yml | 2 +- guests/inventory | 2 +- guests/playbooks/build/jobs/defaults.yml | 4 +- guests/playbooks/build/projects/gtk-vnc.yml | 2 +- guests/playbooks/build/projects/libosinfo.yml | 2 +- .../playbooks/build/projects/libvirt-dbus.yml | 4 +- .../build/projects/libvirt-sandbox.yml | 4 +- .../playbooks/build/projects/libvirt-tck.yml | 4 +- guests/playbooks/build/projects/libvirt.yml | 2 +- .../build/projects/osinfo-db-tools.yml | 2 +- .../playbooks/build/projects/virt-manager.yml | 6 +- .../playbooks/build/projects/virt-viewer.yml | 2 +- jenkins/jobs/defaults.yaml | 4 +- jenkins/new.xml | 6423 ++++++++++++++++ jenkins/old.xml | 6435 +++++++++++++++++ jenkins/projects/gtk-vnc.yaml | 2 +- jenkins/projects/libosinfo.yaml | 2 +- jenkins/projects/libvirt-dbus.yaml | 4 +- jenkins/projects/libvirt-sandbox.yaml | 4 +- jenkins/projects/libvirt-tck.yaml | 4 +- jenkins/projects/libvirt.yaml | 2 +- jenkins/projects/osinfo-db-tools.yaml | 2 +- jenkins/projects/virt-manager.yaml | 6 +- jenkins/projects/virt-viewer.yaml | 2 +- 27 files changed, 12895 insertions(+), 37 deletions(-) delete mode 100644 guests/host_vars/libvirt-fedora-30/docker.yml create mode 100644 guests/host_vars/libvirt-fedora-32/docker.yml rename guests/host_vars/{libvirt-fedora-30 => libvirt-fedora-32}/install.yml (66%) rename guests/host_vars/{libvirt-fedora-30 => libvirt-fedora-32}/main.yml (97%) create mode 100644 jenkins/new.xml create mode 100644 jenkins/old.xml -- 2.25.4

2 7