[libvirt] [libvirt-jenkins-ci PATCH 16/18] ansible: Add virt-viewer project

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- ansible/host_vars/libvirt-centos-7/main.yml | 1 + ansible/host_vars/libvirt-debian-8/main.yml | 1 + ansible/host_vars/libvirt-debian-9/main.yml | 1 + ansible/host_vars/libvirt-fedora-25/main.yml | 1 + ansible/host_vars/libvirt-fedora-26/main.yml | 1 + ansible/host_vars/libvirt-fedora-rawhide/main.yml | 1 + ansible/host_vars/libvirt-freebsd-11/main.yml | 1 + ansible/host_vars/libvirt-ubuntu-14/main.yml | 1 + ansible/host_vars/libvirt-ubuntu-16/main.yml | 1 + ansible/tasks/build.yml | 15 +++++++++++---- ansible/vars/virt-viewer/CentOS-7.yml | 20 ++++++++++++++++++++ ansible/vars/virt-viewer/Debian-8.yml | 18 ++++++++++++++++++ ansible/vars/virt-viewer/Debian-9.yml | 20 ++++++++++++++++++++ ansible/vars/virt-viewer/Fedora-25.yml | 20 ++++++++++++++++++++ ansible/vars/virt-viewer/Fedora-26.yml | 20 ++++++++++++++++++++ ansible/vars/virt-viewer/Fedora-Rawhide.yml | 20 ++++++++++++++++++++ ansible/vars/virt-viewer/FreeBSD-11.yml | 18 ++++++++++++++++++ ansible/vars/virt-viewer/Ubuntu-14.yml | 16 ++++++++++++++++ ansible/vars/virt-viewer/Ubuntu-16.yml | 18 ++++++++++++++++++ 19 files changed, 190 insertions(+), 4 deletions(-) create mode 100644 ansible/vars/virt-viewer/CentOS-7.yml create mode 100644 ansible/vars/virt-viewer/Debian-8.yml create mode 100644 ansible/vars/virt-viewer/Debian-9.yml create mode 100644 ansible/vars/virt-viewer/Fedora-25.yml create mode 100644 ansible/vars/virt-viewer/Fedora-26.yml create mode 100644 ansible/vars/virt-viewer/Fedora-Rawhide.yml create mode 100644 ansible/vars/virt-viewer/FreeBSD-11.yml create mode 100644 ansible/vars/virt-viewer/Ubuntu-14.yml create mode 100644 ansible/vars/virt-viewer/Ubuntu-16.yml diff --git a/ansible/host_vars/libvirt-centos-7/main.yml b/ansible/host_vars/libvirt-centos-7/main.yml index 970839d..fe33bcd 100644 --- a/ansible/host_vars/libvirt-centos-7/main.yml +++ b/ansible/host_vars/libvirt-centos-7/main.yml @@ -13,3 +13,4 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager + - virt-viewer diff --git a/ansible/host_vars/libvirt-debian-8/main.yml b/ansible/host_vars/libvirt-debian-8/main.yml index 5d300e8..42bf6c3 100644 --- a/ansible/host_vars/libvirt-debian-8/main.yml +++ b/ansible/host_vars/libvirt-debian-8/main.yml @@ -11,3 +11,4 @@ projects: - libvirt-tck - osinfo-db-tools - virt-manager + - virt-viewer diff --git a/ansible/host_vars/libvirt-debian-9/main.yml b/ansible/host_vars/libvirt-debian-9/main.yml index 4640d87..ff28698 100644 --- a/ansible/host_vars/libvirt-debian-9/main.yml +++ b/ansible/host_vars/libvirt-debian-9/main.yml @@ -13,3 +13,4 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager + - virt-viewer diff --git a/ansible/host_vars/libvirt-fedora-25/main.yml b/ansible/host_vars/libvirt-fedora-25/main.yml index 265e7ca..8d3b26f 100644 --- a/ansible/host_vars/libvirt-fedora-25/main.yml +++ b/ansible/host_vars/libvirt-fedora-25/main.yml @@ -14,3 +14,4 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager + - virt-viewer diff --git a/ansible/host_vars/libvirt-fedora-26/main.yml b/ansible/host_vars/libvirt-fedora-26/main.yml index 265e7ca..8d3b26f 100644 --- a/ansible/host_vars/libvirt-fedora-26/main.yml +++ b/ansible/host_vars/libvirt-fedora-26/main.yml @@ -14,3 +14,4 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager + - virt-viewer diff --git a/ansible/host_vars/libvirt-fedora-rawhide/main.yml b/ansible/host_vars/libvirt-fedora-rawhide/main.yml index 265e7ca..8d3b26f 100644 --- a/ansible/host_vars/libvirt-fedora-rawhide/main.yml +++ b/ansible/host_vars/libvirt-fedora-rawhide/main.yml @@ -14,3 +14,4 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager + - virt-viewer diff --git a/ansible/host_vars/libvirt-freebsd-11/main.yml b/ansible/host_vars/libvirt-freebsd-11/main.yml index 563a254..69b172c 100644 --- a/ansible/host_vars/libvirt-freebsd-11/main.yml +++ b/ansible/host_vars/libvirt-freebsd-11/main.yml @@ -19,3 +19,4 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager + - virt-viewer diff --git a/ansible/host_vars/libvirt-ubuntu-14/main.yml b/ansible/host_vars/libvirt-ubuntu-14/main.yml index f77a167..18b013d 100644 --- a/ansible/host_vars/libvirt-ubuntu-14/main.yml +++ b/ansible/host_vars/libvirt-ubuntu-14/main.yml @@ -8,3 +8,4 @@ projects: - libvirt-tck - osinfo-db-tools - virt-manager + - virt-viewer diff --git a/ansible/host_vars/libvirt-ubuntu-16/main.yml b/ansible/host_vars/libvirt-ubuntu-16/main.yml index 04191bc..7baecf7 100644 --- a/ansible/host_vars/libvirt-ubuntu-16/main.yml +++ b/ansible/host_vars/libvirt-ubuntu-16/main.yml @@ -12,3 +12,4 @@ projects: - libvirt-tck - osinfo-db-tools - virt-manager + - virt-viewer diff --git a/ansible/tasks/build.yml b/ansible/tasks/build.yml index aa2d60e..140d4da 100644 --- a/ansible/tasks/build.yml +++ b/ansible/tasks/build.yml @@ -42,7 +42,8 @@ project == 'libvirt-cim' or project == 'libvirt-glib' or project == 'libvirt-sandbox' or - project == 'osinfo-db-tools' ) + project == 'osinfo-db-tools' or + project == 'virt-viewer' ) - name: '{{ project }}: Run configure' command: './configure {{ configure_options }}' @@ -62,7 +63,9 @@ project == 'libvirt-glib' or project == 'libvirt-sandbox' or project == 'osinfo-db' or - project == 'osinfo-db-tools' ) + project == 'osinfo-db-tools' or + ( project == 'virt-viewer' and + os_version != 'Rawhide' ) ) - name: '{{ project }}: Run sanity checks' command: '{{ make }} -j{{ smp }} syntax-check' @@ -74,7 +77,9 @@ os_name != 'FreeBSD' ) or project == 'libvirt-glib' or project == 'libvirt-sandbox' or - project == 'osinfo-db-tools' ) + project == 'osinfo-db-tools' or + ( project == 'virt-viewer' and + os_version != 'Rawhide' ) ) - name: '{{ project }}: Run test suite' command: '{{ make }} -j{{ smp }} check' @@ -87,7 +92,9 @@ project == 'libvirt-glib' or project == 'libvirt-sandbox' or project == 'osinfo-db' or - project == 'osinfo-db-tools' ) + project == 'osinfo-db-tools' or + ( project == 'virt-viewer' and + os_version != 'Rawhide' ) ) - name: '{{ project }}: Build RPM package' command: '{{ make }} -j{{ smp }} rpm' diff --git a/ansible/vars/virt-viewer/CentOS-7.yml b/ansible/vars/virt-viewer/CentOS-7.yml new file mode 100644 index 0000000..44081ec --- /dev/null +++ b/ansible/vars/virt-viewer/CentOS-7.yml @@ -0,0 +1,20 @@ +--- +packages: + - glib2-devel + - gtk-vnc2-devel + - gtk3-devel + - intltool + - libgovirt-devel + - libxml2 + - libxml2-devel + - spice-gtk3-devel + +extra_packages: + - libvirt-devel + - libvirt-glib-devel + +features: + with_gtk_vnc: --with-gtk-vnc + with_libvirt: --with-libvirt + with_ovirt: --with-ovirt + with_spice_gtk: --with-spice-gtk diff --git a/ansible/vars/virt-viewer/Debian-8.yml b/ansible/vars/virt-viewer/Debian-8.yml new file mode 100644 index 0000000..54c34a9 --- /dev/null +++ b/ansible/vars/virt-viewer/Debian-8.yml @@ -0,0 +1,18 @@ +--- +packages: + - intltool + - libglib2.0-dev + - libgtk-3-dev + - libgtk-vnc-2.0-dev + - libxml2-dev + - libxml2-utils + +extra_packages: + - libvirt-dev + - libvirt-glib-1.0-dev + +features: + with_gtk_vnc: --with-gtk-vnc + with_libvirt: --with-libvirt + with_ovirt: --without-ovirt # not available + with_spice_gtk: --without-spice-gtk # too old diff --git a/ansible/vars/virt-viewer/Debian-9.yml b/ansible/vars/virt-viewer/Debian-9.yml new file mode 100644 index 0000000..e9b7653 --- /dev/null +++ b/ansible/vars/virt-viewer/Debian-9.yml @@ -0,0 +1,20 @@ +--- +packages: + - intltool + - libglib2.0-dev + - libgovirt-dev + - libgtk-3-dev + - libgtk-vnc-2.0-dev + - libspice-client-gtk-3.0-dev + - libxml2-dev + - libxml2-utils + +extra_packages: + - libvirt-dev + - libvirt-glib-1.0-dev + +features: + with_gtk_vnc: --with-gtk-vnc + with_libvirt: --with-libvirt + with_ovirt: --without-ovirt # not available + with_spice_gtk: --with-spice-gtk diff --git a/ansible/vars/virt-viewer/Fedora-25.yml b/ansible/vars/virt-viewer/Fedora-25.yml new file mode 100644 index 0000000..44081ec --- /dev/null +++ b/ansible/vars/virt-viewer/Fedora-25.yml @@ -0,0 +1,20 @@ +--- +packages: + - glib2-devel + - gtk-vnc2-devel + - gtk3-devel + - intltool + - libgovirt-devel + - libxml2 + - libxml2-devel + - spice-gtk3-devel + +extra_packages: + - libvirt-devel + - libvirt-glib-devel + +features: + with_gtk_vnc: --with-gtk-vnc + with_libvirt: --with-libvirt + with_ovirt: --with-ovirt + with_spice_gtk: --with-spice-gtk diff --git a/ansible/vars/virt-viewer/Fedora-26.yml b/ansible/vars/virt-viewer/Fedora-26.yml new file mode 100644 index 0000000..44081ec --- /dev/null +++ b/ansible/vars/virt-viewer/Fedora-26.yml @@ -0,0 +1,20 @@ +--- +packages: + - glib2-devel + - gtk-vnc2-devel + - gtk3-devel + - intltool + - libgovirt-devel + - libxml2 + - libxml2-devel + - spice-gtk3-devel + +extra_packages: + - libvirt-devel + - libvirt-glib-devel + +features: + with_gtk_vnc: --with-gtk-vnc + with_libvirt: --with-libvirt + with_ovirt: --with-ovirt + with_spice_gtk: --with-spice-gtk diff --git a/ansible/vars/virt-viewer/Fedora-Rawhide.yml b/ansible/vars/virt-viewer/Fedora-Rawhide.yml new file mode 100644 index 0000000..44081ec --- /dev/null +++ b/ansible/vars/virt-viewer/Fedora-Rawhide.yml @@ -0,0 +1,20 @@ +--- +packages: + - glib2-devel + - gtk-vnc2-devel + - gtk3-devel + - intltool + - libgovirt-devel + - libxml2 + - libxml2-devel + - spice-gtk3-devel + +extra_packages: + - libvirt-devel + - libvirt-glib-devel + +features: + with_gtk_vnc: --with-gtk-vnc + with_libvirt: --with-libvirt + with_ovirt: --with-ovirt + with_spice_gtk: --with-spice-gtk diff --git a/ansible/vars/virt-viewer/FreeBSD-11.yml b/ansible/vars/virt-viewer/FreeBSD-11.yml new file mode 100644 index 0000000..f3a6332 --- /dev/null +++ b/ansible/vars/virt-viewer/FreeBSD-11.yml @@ -0,0 +1,18 @@ +--- +packages: + - glib + - gtk-vnc + - gtk3 + - intltool + - libxml2 + - spice-gtk + +extra_packages: + - libvirt + - libvirt-glib + +features: + with_gtk_vnc: --with-gtk-vnc + with_libvirt: --with-libvirt + with_ovirt: --without-ovirt # not available + with_spice_gtk: --with-spice-gtk diff --git a/ansible/vars/virt-viewer/Ubuntu-14.yml b/ansible/vars/virt-viewer/Ubuntu-14.yml new file mode 100644 index 0000000..dc68c85 --- /dev/null +++ b/ansible/vars/virt-viewer/Ubuntu-14.yml @@ -0,0 +1,16 @@ +--- +packages: + - intltool + - libatspi2.0-dev + - libglib2.0-dev + - libgtk-3-dev + - libgtk-vnc-2.0-dev + - libspice-client-gtk-3.0-dev + - libxml2-dev + - libxml2-utils + +features: + with_gtk_vnc: --with-gtk-vnc + with_libvirt: --without-libvirt # too old + with_ovirt: --without-ovirt # not available + with_spice_gtk: --without-spice-gtk # too old diff --git a/ansible/vars/virt-viewer/Ubuntu-16.yml b/ansible/vars/virt-viewer/Ubuntu-16.yml new file mode 100644 index 0000000..54c34a9 --- /dev/null +++ b/ansible/vars/virt-viewer/Ubuntu-16.yml @@ -0,0 +1,18 @@ +--- +packages: + - intltool + - libglib2.0-dev + - libgtk-3-dev + - libgtk-vnc-2.0-dev + - libxml2-dev + - libxml2-utils + +extra_packages: + - libvirt-dev + - libvirt-glib-1.0-dev + +features: + with_gtk_vnc: --with-gtk-vnc + with_libvirt: --with-libvirt + with_ovirt: --without-ovirt # not available + with_spice_gtk: --without-spice-gtk # too old -- 2.13.6