January 2020 - Devel - libvirt List Archives

[libvirt] [jenkins-ci PATCH v3 0/7] Add support for gtk-vnc builds
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

Support gtk-vnc and make virt-viewer depend on it I sent this months ago & forgot to push it. Re-sending just in case something has invalidated any patches. I've at least added the newer distros This time with gdk-pixbuf added and previous suggested fixes Daniel P. Berrangé (7): mappings: add libgcrypt mappings: add PulseAudio mappings: add gdk-pixbuf guests: pull in deps for gtk-vnc project projects: add gtk-vnc project projects: make virt-viewer depend on gtk-vnc jobs mappings: remove gtk-vnc2 guests/host_vars/libvirt-centos-7/main.yml | 1 + guests/host_vars/libvirt-centos-8/main.yml | 1 + guests/host_vars/libvirt-debian-10/main.yml | 1 + guests/host_vars/libvirt-debian-9/main.yml | 1 + guests/host_vars/libvirt-debian-sid/main.yml | 1 + guests/host_vars/libvirt-fedora-30/main.yml | 3 ++ guests/host_vars/libvirt-fedora-31/main.yml | 1 + .../host_vars/libvirt-fedora-rawhide/main.yml | 1 + guests/host_vars/libvirt-freebsd-11/main.yml | 1 + guests/host_vars/libvirt-freebsd-12/main.yml | 1 + .../libvirt-freebsd-current/main.yml | 1 + guests/host_vars/libvirt-ubuntu-1604/main.yml | 1 + guests/host_vars/libvirt-ubuntu-1804/main.yml | 1 + guests/playbooks/build/jobs/defaults.yml | 3 ++ .../build/projects/gtk-vnc+mingw32.yml | 12 ++++++ .../build/projects/gtk-vnc+mingw64.yml | 12 ++++++ guests/playbooks/build/projects/gtk-vnc.yml | 19 +++++++++ guests/vars/mappings.yml | 42 +++++++++++++------ guests/vars/projects/gtk-vnc+mingw32.yml | 7 ++++ guests/vars/projects/gtk-vnc+mingw64.yml | 7 ++++ guests/vars/projects/gtk-vnc.yml | 12 ++++++ guests/vars/projects/virt-viewer+mingw32.yml | 1 - guests/vars/projects/virt-viewer+mingw64.yml | 1 - guests/vars/projects/virt-viewer.yml | 1 - jenkins/jobs/defaults.yaml | 3 ++ jenkins/projects/gtk-vnc+mingw32.yaml | 12 ++++++ jenkins/projects/gtk-vnc+mingw64.yaml | 12 ++++++ jenkins/projects/gtk-vnc.yaml | 15 +++++++ jenkins/projects/virt-viewer+mingw32.yaml | 4 +- jenkins/projects/virt-viewer+mingw64.yaml | 4 +- jenkins/projects/virt-viewer.yaml | 4 +- 31 files changed, 167 insertions(+), 19 deletions(-) create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw32.yml create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw64.yml create mode 100644 guests/playbooks/build/projects/gtk-vnc.yml create mode 100644 guests/vars/projects/gtk-vnc+mingw32.yml create mode 100644 guests/vars/projects/gtk-vnc+mingw64.yml create mode 100644 guests/vars/projects/gtk-vnc.yml create mode 100644 jenkins/projects/gtk-vnc+mingw32.yaml create mode 100644 jenkins/projects/gtk-vnc+mingw64.yaml create mode 100644 jenkins/projects/gtk-vnc.yaml -- 2.23.0

2 13

[libvirt] [PATCH] schema: Allow iSCSI source to have interleaved children
by Michal Privoznik 08 Jan '20

08 Jan '20

There is no need to require users to produce iSCSI disk source following our ordering of children elements. In fact, we don't even accept our own order in the schema :(. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/schemas/domaincommon.rng | 24 ++++++++++--------- .../disk-network-iscsi-modern.args | 9 ++++++- .../disk-network-iscsi-modern.xml | 13 ++++++++++ 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 9b555d6acb..76d94b156f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1772,17 +1772,19 @@ <value>iscsi</value> </attribute> <attribute name="name"/> - <ref name="diskSourceCommon"/> - <ref name="diskSourceNetworkHost"/> - <optional> - <ref name="diskAuth"/> - </optional> - <optional> - <ref name="encryption"/> - </optional> - <optional> - <ref name="initiatorinfo"/> - </optional> + <interleave> + <ref name="diskSourceCommon"/> + <ref name="diskSourceNetworkHost"/> + <optional> + <ref name="diskAuth"/> + </optional> + <optional> + <ref name="encryption"/> + </optional> + <optional> + <ref name="initiatorinfo"/> + </optional> + </interleave> </element> </define> diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args index 762dc0e04a..57eaeb40ee 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args @@ -58,4 +58,11 @@ file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,\ file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,\ id=drive-scsi0-0-0-1 \ -device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=1,\ -drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 +drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \ +-drive file.driver=iscsi,file.portal=example.org:3260,\ +file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,\ +file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,\ +file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,\ +id=drive-scsi0-0-0-2 \ +-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=2,\ +drive=drive-scsi0-0-0-2,id=scsi0-0-0-2 diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml b/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml index 759d5e217f..07bb457bfa 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml @@ -65,6 +65,19 @@ </source> <target dev='sdb' bus='scsi'/> </disk> + <disk type='network' device='lun'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example:server/0'> + <host name='example.org' port='3260'/> + <initiator> + <iqn name='iqn.1992-01.com.example:client'/> + </initiator> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + </source> + <target dev='sdc' bus='scsi'/> + </disk> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <controller type='scsi' index='0' model='virtio-scsi'/> -- 2.24.1

2 1

[libvirt] [jenkins-ci PATCH v2] guests: add more detailed docs on deploying FreeBSD
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

Provide instructions on how to download & deploy a working FreeBSD install that's suitable for CI, as there are several gotchas not mentioned in the current docs. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/README.markdown | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/guests/README.markdown b/guests/README.markdown index 7e63540..d450b4a 100644 --- a/guests/README.markdown +++ b/guests/README.markdown @@ -137,6 +137,37 @@ FreeBSD Installation of FreeBSD guests must be performed manually; alternatively, the official qcow2 images can be used to quickly bring up such guests. + $ MAJOR=12 + $ MINOR=1 + $ VER=$MAJOR.$MINOR-RELEASE + $ sudo wget -O /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2.xz \ + https://download.freebsd.org/ftp/releases/VM-IMAGES/$VER/amd64/Latest/FreeB… + $ sudo unxz /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2.xz + $ sudo virt-install \ + --import \ + --name libvirt-freebsd-$MAJOR \ + --vcpus 2 \ + --graphics vnc \ + --noautoconsole \ + --console pty \ + --sound none \ + --rng device=/dev/urandom,model=virtio \ + --memory 2048 \ + --os-variant freebsd$MAJOR.0 \ + --disk /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2 + +The default qcow2 images are sized too small to be usable. To enlarge +them do + + $ sudo virsh blockresize libvirt-freebsd-$MAJOR \ + /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2 20G + +Then inside the guest, as root, enlarge the 3rd partition & filesystem +to consume all new space: + + # gpart resize -i 3 vtbd0 + # service growfs onestart + Some manual tweaking will be needed, in particular: * `/etc/ssh/sshd_config` must contain the `PermitRootLogin yes` directive; -- 2.23.0

2 1

[libvirt] [PATCH] jenkins: skip gtk-vnc RPM build on centos 8
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

We don't have a centos 8 host deployed in CI at this time Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- jenkins/projects/gtk-vnc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/jenkins/projects/gtk-vnc.yaml b/jenkins/projects/gtk-vnc.yaml index 95ff14b..4887000 100644 --- a/jenkins/projects/gtk-vnc.yaml +++ b/jenkins/projects/gtk-vnc.yaml @@ -15,7 +15,6 @@ # RPM build is still not possible on CentOS7 as it does not # have the needed RPM macros for meson. machines: - - libvirt-centos-8 - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide -- 2.24.1

2 1

[libvirt] [jenkins-ci PATCH] jenkins: recursively update submodules on checkout
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

The ansible playback runs 'git submodule update --init', so we should have jenkins do the equivalent to ensure consistent build environment setup. In particular this works arounda bug with Meson when using GIT on CentOS 7, causing it to fail to automatically update the submodules. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- jenkins/jobs/autotools.yaml | 2 ++ jenkins/jobs/generic.yaml | 2 ++ jenkins/jobs/go.yaml | 2 ++ jenkins/jobs/meson.yaml | 2 ++ jenkins/jobs/perl-modulebuild.yaml | 2 ++ jenkins/jobs/python-distutils.yaml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/jenkins/jobs/autotools.yaml b/jenkins/jobs/autotools.yaml index 413af73..6b4d3f8 100644 --- a/jenkins/jobs/autotools.yaml +++ b/jenkins/jobs/autotools.yaml @@ -27,6 +27,8 @@ after: true skip-tag: true wipe-workspace: false + submodule: + recursive: true triggers: - reverse: jobs: '{obj:parent_jobs}' diff --git a/jenkins/jobs/generic.yaml b/jenkins/jobs/generic.yaml index ca69513..46425ec 100644 --- a/jenkins/jobs/generic.yaml +++ b/jenkins/jobs/generic.yaml @@ -27,6 +27,8 @@ after: true skip-tag: true wipe-workspace: false + submodule: + recursive: true triggers: - reverse: jobs: '{obj:parent_jobs}' diff --git a/jenkins/jobs/go.yaml b/jenkins/jobs/go.yaml index 1bdcb5f..3d25493 100644 --- a/jenkins/jobs/go.yaml +++ b/jenkins/jobs/go.yaml @@ -27,6 +27,8 @@ after: true skip-tag: true wipe-workspace: false + submodule: + recursive: true triggers: - reverse: jobs: '{obj:parent_jobs}' diff --git a/jenkins/jobs/meson.yaml b/jenkins/jobs/meson.yaml index 4d84978..bf7e8ef 100644 --- a/jenkins/jobs/meson.yaml +++ b/jenkins/jobs/meson.yaml @@ -27,6 +27,8 @@ after: true skip-tag: true wipe-workspace: false + submodule: + recursive: true triggers: - reverse: jobs: '{obj:parent_jobs}' diff --git a/jenkins/jobs/perl-modulebuild.yaml b/jenkins/jobs/perl-modulebuild.yaml index 7173493..cea0597 100644 --- a/jenkins/jobs/perl-modulebuild.yaml +++ b/jenkins/jobs/perl-modulebuild.yaml @@ -27,6 +27,8 @@ after: true skip-tag: true wipe-workspace: false + submodule: + recursive: true triggers: - reverse: jobs: '{obj:parent_jobs}' diff --git a/jenkins/jobs/python-distutils.yaml b/jenkins/jobs/python-distutils.yaml index f56794c..4921aa7 100644 --- a/jenkins/jobs/python-distutils.yaml +++ b/jenkins/jobs/python-distutils.yaml @@ -27,6 +27,8 @@ after: true skip-tag: true wipe-workspace: false + submodule: + recursive: true triggers: - reverse: jobs: '{obj:parent_jobs}' -- 2.23.0

2 1

Re: [libvirt] [Libvirt-ci] Build failed in Jenkins: libosinfo-build » libvirt-debian-9 #307
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

On Tue, Jan 07, 2020 at 07:01:53PM +0000, ci(a)centos.org wrote: > See <https://ci.centos.org/job/libosinfo-build/systems=libvirt-debian-9/307/disp…> > <https://ci.centos.org/job/libosinfo-build/systems=libvirt-debian-9/ws/build…>: /home/jenkins/build/libvirt/lib/x86_64-linux-gnu/libosinfo-1.0.so.0: version `LIBOSINFO_1.8.0' not found (required by <https://ci.centos.org/job/libosinfo-build/systems=libvirt-debian-9/ws/build…)> This problem is a bug in g-ir-scanner on Debian 9. It is mistakenly linking against the libosinfo.so installed by the prevuous build in $HOME/build/libvirt, instead of the one it just built locally. https://bugzilla.gnome.org/show_bug.cgi?id=781525 I fixed by # ssh jenkins@libvirt-debian-9 $ cd build $ find | grep libosinfo-1.0.so | xargs rm and then re-triggered the jobs. It will potentially re-occurr any time we add a new public API to libosinfo Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

2 2

[libvirt] [perl PATCH] make Time::HiRes optional in test suite
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- t/800-events.t | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/t/800-events.t b/t/800-events.t index dfbba8f..b7e767f 100644 --- a/t/800-events.t +++ b/t/800-events.t @@ -3,20 +3,24 @@ use strict; use warnings; -use Test::More tests => 23; +use Test::More; my $URI = "test:///default"; my $DOM = "test"; BEGIN { - use_ok('Sys::Virt'); + eval 'use Time::HiRes qw(gettimeofday)'; + if ($@) { + plan skip_all => "Time::HiRes is not available"; + return; + } + plan tests => 23; + use_ok('Sys::Virt'); } package Sys::Virt::Event::Simple; -use Time::HiRes qw(gettimeofday); - use base qw(Sys::Virt::Event); sub new { @@ -38,7 +42,7 @@ sub new { sub _now { my $self; - my @now = gettimeofday; + my @now = &Time::HiRes::gettimeofday(); return $now[0] * 1000 + (($now[1] - ($now[1] % 1000)) / 1000); } -- 2.23.0

2 1

[libvirt] [jenkins-ci PATCH] jobs: Fix autotools-check-job
by Andrea Bolognani 08 Jan '20

08 Jan '20

find expects {} to be used as placeholder for filenames, but that confuses Jenkins Job Builder which uses {foo} for variables. Use xargs in a pipe instead. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the build breaker rule. guests/playbooks/build/jobs/autotools-check-job.yml | 2 +- jenkins/jobs/autotools.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guests/playbooks/build/jobs/autotools-check-job.yml b/guests/playbooks/build/jobs/autotools-check-job.yml index a306902..7aa2a04 100644 --- a/guests/playbooks/build/jobs/autotools-check-job.yml +++ b/guests/playbooks/build/jobs/autotools-check-job.yml @@ -9,7 +9,7 @@ cd build if ! $MAKE check then - find -name test-suite.log -exec cat {} \; + find -name test-suite.log | xargs cat exit 1 fi when: diff --git a/jenkins/jobs/autotools.yaml b/jenkins/jobs/autotools.yaml index 72dd72e..413af73 100644 --- a/jenkins/jobs/autotools.yaml +++ b/jenkins/jobs/autotools.yaml @@ -126,7 +126,7 @@ cd build if ! $MAKE check then - find -name test-suite.log -exec cat {} \; + find -name test-suite.log | xargs cat exit 1 fi publishers: -- 2.24.1

1 0

[libvirt] [jenkins-ci PATCH] guests: optionally wait for installation completion
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

The install command is hardcoded to put the virt-install command into the background. It is useful to be able to wait for completion, so you know when you can go onto the package update step of setup, without having to check back to see if the guest has finished installing. Using --noautoconsole is preferred syntax for virt-install, avoiding a warning about use of "--wait 0". Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/lcitool | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/guests/lcitool b/guests/lcitool index d24ac0d..8a681e4 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -394,11 +394,20 @@ class Application: help="target architecture for cross compiler", ) + def add_wait_arg(parser): + parser.add_argument( + "-w", "--wait", + help="wait for installation to complete", + default=False, + action="store_true", + ) + installparser = subparsers.add_parser( "install", help="perform unattended host installation") installparser.set_defaults(func=self._action_install) add_hosts_arg(installparser) + add_wait_arg(installparser) updateparser = subparsers.add_parser( "update", help="prepare hosts and keep them updated") @@ -597,9 +606,11 @@ class Application: "--rng", "device=/dev/urandom,model=virtio", "--initrd-inject", initrd_inject, "--extra-args", extra_arg, - "--wait", "0", ] + if not args.wait: + cmd.append("--noautoconsole") + # Only configure autostart for the guest for the jenkins flavor if flavor == "jenkins": cmd += ["--autostart"] -- 2.23.0

2 2

[libvirt] [jenkins-ci PATCH v4 0/7] Add support for gtk-vnc builds
by Daniel P. Berrangé 08 Jan '20

08 Jan '20

Support gtk-vnc and make virt-viewer depend on it v3: https://www.redhat.com/archives/libvir-list/2019-December/msg00957.html Daniel P. Berrangé (7): mappings: add libgcrypt mappings: add PulseAudio mappings: add gdk-pixbuf guests: pull in deps for gtk-vnc project projects: add gtk-vnc project projects: make virt-viewer depend on gtk-vnc jobs mappings: remove gtk-vnc2 guests/host_vars/libvirt-centos-7/main.yml | 1 + guests/host_vars/libvirt-centos-8/main.yml | 1 + guests/host_vars/libvirt-debian-10/main.yml | 1 + guests/host_vars/libvirt-debian-9/main.yml | 1 + guests/host_vars/libvirt-debian-sid/main.yml | 1 + guests/host_vars/libvirt-fedora-30/main.yml | 3 ++ guests/host_vars/libvirt-fedora-31/main.yml | 1 + .../host_vars/libvirt-fedora-rawhide/main.yml | 1 + guests/host_vars/libvirt-freebsd-11/main.yml | 1 + guests/host_vars/libvirt-freebsd-12/main.yml | 1 + .../libvirt-freebsd-current/main.yml | 1 + guests/host_vars/libvirt-ubuntu-1604/main.yml | 1 + guests/host_vars/libvirt-ubuntu-1804/main.yml | 1 + guests/playbooks/build/jobs/defaults.yml | 3 ++ .../build/projects/gtk-vnc+mingw32.yml | 12 ++++++ .../build/projects/gtk-vnc+mingw64.yml | 12 ++++++ guests/playbooks/build/projects/gtk-vnc.yml | 19 +++++++++ guests/vars/mappings.yml | 42 +++++++++++++------ guests/vars/projects/gtk-vnc+mingw32.yml | 7 ++++ guests/vars/projects/gtk-vnc+mingw64.yml | 7 ++++ guests/vars/projects/gtk-vnc.yml | 12 ++++++ guests/vars/projects/virt-viewer+mingw32.yml | 1 - guests/vars/projects/virt-viewer+mingw64.yml | 1 - guests/vars/projects/virt-viewer.yml | 1 - jenkins/jobs/defaults.yaml | 3 ++ jenkins/projects/gtk-vnc+mingw32.yaml | 12 ++++++ jenkins/projects/gtk-vnc+mingw64.yaml | 12 ++++++ jenkins/projects/gtk-vnc.yaml | 22 ++++++++++ jenkins/projects/virt-viewer+mingw32.yaml | 4 +- jenkins/projects/virt-viewer+mingw64.yaml | 4 +- jenkins/projects/virt-viewer.yaml | 4 +- 31 files changed, 174 insertions(+), 19 deletions(-) create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw32.yml create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw64.yml create mode 100644 guests/playbooks/build/projects/gtk-vnc.yml create mode 100644 guests/vars/projects/gtk-vnc+mingw32.yml create mode 100644 guests/vars/projects/gtk-vnc+mingw64.yml create mode 100644 guests/vars/projects/gtk-vnc.yml create mode 100644 jenkins/projects/gtk-vnc+mingw32.yaml create mode 100644 jenkins/projects/gtk-vnc+mingw64.yaml create mode 100644 jenkins/projects/gtk-vnc.yaml -- 2.23.0

2 10