April 2020 - Devel - libvirt List Archives

Entering freeze for libvirt 6.3.0
by Daniel Veillard 01 May '20

01 May '20

We are getting close to the end of the month, so I tagged RC1 in git and pushed signed source tarball and rpms to the usual place: https://libvirt.org/sources/ Seems to work fine in my very limited testing, CI seems green except for a couple of mingw tests, so that looks good from a distance. Please give it some testing, RC2 should land on Thursday, and then if everything looks fine I could push the final version over the coming week-end. Stay safe, please test it, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt-python PATCH v2 0/3] gitlab: introduce CI jobs for validating python build
by Daniel P. Berrangé 01 May '20

01 May '20

This introduces GitLab CI to the python module. Traditional Jenkins has validated the python build across all distros, using libvirt git. This tested one axis - a variety of python versions - but failed to test the other interesting axis - a variety of libvirt versions. This new CI setup fixes that mistake validating both axis. Daniel P. Berrangé (3): test: workaround missing VIR_TYPED_PARAM enums in API definition gitlab: introduce CI jobs testing git master & distro libvirt travis: delete redundant configuration .gitlab-ci.yml | 171 +++++++++++++++++++++++++++ .travis.yml | 55 --------- ci/README.rst | 12 ++ ci/libvirt-centos-7.Dockerfile | 86 ++++++++++++++ ci/libvirt-centos-8.Dockerfile | 64 ++++++++++ ci/libvirt-debian-10.Dockerfile | 56 +++++++++ ci/libvirt-debian-9.Dockerfile | 59 +++++++++ ci/libvirt-debian-sid.Dockerfile | 56 +++++++++ ci/libvirt-fedora-30.Dockerfile | 53 +++++++++ ci/libvirt-fedora-31.Dockerfile | 53 +++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 54 +++++++++ ci/libvirt-opensuse-151.Dockerfile | 55 +++++++++ ci/libvirt-ubuntu-1604.Dockerfile | 59 +++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 59 +++++++++ ci/refresh | 27 +++++ sanitytest.py | 6 +- 16 files changed, 869 insertions(+), 56 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 .travis.yml 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

2 6

[PATCH] docs: note that <dnsmasq:option> was added in libvirt 5.6.0
by Laine Stump 01 May '20

01 May '20

To make it simpler to answer questions of "Why doesn't this thing work for me?" Signed-off-by: Laine Stump <laine(a)redhat.com> --- docs/formatnetwork.html.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 2bccac014b..3571d44cd6 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -1124,9 +1124,11 @@ <h3><a id="elementsNamespaces">Network namespaces</a></h3> <p> - A special XML namespace is available for passing options directly to the - underlying dnsmasq configuration file. Usage of XML namespaces comes with no - support guarantees, so use at your own risk. + A special XML namespace is available for passing options + directly to the underlying dnsmasq configuration + file <span class="since">Since 1.0.3</span>. Usage of XML + namespaces comes with no support guarantees, so use at your own + risk. </p> <p> -- 2.25.4

2 1

[libvirt-ci PATCH 0/4] check-dco: Support namespaces other than libvirt
by Andrea Bolognani 01 May '20

01 May '20

See patch 4/4. Andrea Bolognani (4): containers: New top-level directory check-dco: Fix script name in top comment check-dco: Change remote name check-dco: Support namespaces other than libvirt .gitlab-ci.yml | 2 +- {check-dco => containers/check-dco}/Dockerfile | 0 {check-dco => containers/check-dco}/check-dco.py | 16 ++++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) rename {check-dco => containers/check-dco}/Dockerfile (100%) rename {check-dco => containers/check-dco}/check-dco.py (84%) -- 2.25.4

2 5

ANNOUNCE: libvirt-dbus 1.4.0 released
by Pavel Hrdina 30 Apr '20

30 Apr '20

I'm happy to announce the release of libvirt-dbus 1.4.0. libvirt-dbus wraps libvirt API to provide high-level object-oriented API better suited for dbus-based applications. https://libvirt.org/sources/dbus/libvirt-dbus-1.4.0.tar.xz * New features - Support for all relevant domain snapshot APIs * Build-system changes - Converted to meson/ninja build system * Documentation - Everything was converted to reStructuredText Thanks everybody who contributed! Pavel

1 0

[libvirt-dbus PATCH] HACKING: add dbus-daemon as dependency to run tests
by Pavel Hrdina 30 Apr '20

30 Apr '20

We are using dbus-daemon to run our tests but it was never listed as it was installed by default on most distributions, however, Fedora switched to dbus-broker which is not that easy to use so we need to explicitly require it as well. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. HACKING.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/HACKING.rst b/HACKING.rst index 6f2bca1..1c63de0 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -36,7 +36,11 @@ Running from git repository ninja -C build test - The test tool requires python3, python3-pytest, python3-dbus and flake8. + The test tool requires these packages: + + :: + + python3, python3-pytest, python3-dbus, flake8, dbus-daemon It is possible to run only specific test using: -- 2.25.4

1 0

[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