Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx> --- guests/host_vars/libvirt-centos-7/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-29/main.yml | 1 + guests/host_vars/libvirt-fedora-30/main.yml | 1 + guests/host_vars/libvirt-fedora-rawhide/main.yml | 3 +++ guests/host_vars/libvirt-freebsd-11/main.yml | 1 + guests/host_vars/libvirt-freebsd-12/main.yml | 1 + guests/host_vars/libvirt-freebsd-current/main.yml | 1 + guests/host_vars/libvirt-ubuntu-18/main.yml | 1 + guests/playbooks/build/jobs/defaults.yml | 2 ++ .../playbooks/build/projects/gtk-vnc+mingw32.yml | 12 ++++++++++++ .../playbooks/build/projects/gtk-vnc+mingw64.yml | 12 ++++++++++++ guests/playbooks/build/projects/gtk-vnc.yml | 12 ++++++++++++ guests/vars/projects/gtk-vnc+mingw32.yml | 6 ++++++ guests/vars/projects/gtk-vnc+mingw64.yml | 6 ++++++ guests/vars/projects/gtk-vnc.yml | 11 +++++++++++ jenkins/jobs/defaults.yaml | 2 ++ jenkins/projects/gtk-vnc+mingw32.yaml | 11 +++++++++++ jenkins/projects/gtk-vnc+mingw64.yaml | 11 +++++++++++ jenkins/projects/gtk-vnc.yaml | 15 +++++++++++++++ 21 files changed, 112 insertions(+) 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 diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml index fa4fc67..63e8501 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-cim diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml index ec7e6b4..b2b0b4d 100644 --- a/guests/host_vars/libvirt-debian-9/main.yml +++ b/guests/host_vars/libvirt-debian-9/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_vars/libvirt-debian-sid/main.yml index 1c7a29b..9c188cf 100644 --- a/guests/host_vars/libvirt-debian-sid/main.yml +++ b/guests/host_vars/libvirt-debian-sid/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-fedora-29/main.yml b/guests/host_vars/libvirt-fedora-29/main.yml index bebf171..bdff061 100644 --- a/guests/host_vars/libvirt-fedora-29/main.yml +++ b/guests/host_vars/libvirt-fedora-29/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-cim diff --git a/guests/host_vars/libvirt-fedora-30/main.yml b/guests/host_vars/libvirt-fedora-30/main.yml index 4ad27a6..bccc5fb 100644 --- a/guests/host_vars/libvirt-fedora-30/main.yml +++ b/guests/host_vars/libvirt-fedora-30/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-cim diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml index ed0a3fa..9bd74e1 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -1,5 +1,8 @@ --- projects: + - gtk-vnc + - gtk-vnc+mingw32 + - gtk-vnc+mingw64 - libosinfo - libosinfo+mingw32 - libosinfo+mingw64 diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_vars/libvirt-freebsd-11/main.yml index ed805c9..0111b87 100644 --- a/guests/host_vars/libvirt-freebsd-11/main.yml +++ b/guests/host_vars/libvirt-freebsd-11/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-freebsd-12/main.yml b/guests/host_vars/libvirt-freebsd-12/main.yml index 8bbe158..0c2e352 100644 --- a/guests/host_vars/libvirt-freebsd-12/main.yml +++ b/guests/host_vars/libvirt-freebsd-12/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/host_vars/libvirt-freebsd-current/main.yml index 62498fd..a106ec0 100644 --- a/guests/host_vars/libvirt-freebsd-current/main.yml +++ b/guests/host_vars/libvirt-freebsd-current/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars/libvirt-ubuntu-18/main.yml index bb465e8..ca8f53e 100644 --- a/guests/host_vars/libvirt-ubuntu-18/main.yml +++ b/guests/host_vars/libvirt-ubuntu-18/main.yml @@ -1,5 +1,6 @@ --- projects: + - gtk-vnc - libosinfo - libvirt - libvirt-dbus diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/build/jobs/defaults.yml index 9b0fe30..8a9eebc 100644 --- a/guests/playbooks/build/jobs/defaults.yml +++ b/guests/playbooks/build/jobs/defaults.yml @@ -38,6 +38,8 @@ mingw64_local_env: | export PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" mingw64_autogen_args: --host=x86_64-w64-mingw32 git_urls: + gtk-vnc: + default: https://gitlab.gnome.org/GNOME/gtk-vnc.git libosinfo: default: https://gitlab.com/libosinfo/libosinfo.git libvirt-cim: diff --git a/guests/playbooks/build/projects/gtk-vnc+mingw32.yml b/guests/playbooks/build/projects/gtk-vnc+mingw32.yml new file mode 100644 index 0000000..0f7c8f3 --- /dev/null +++ b/guests/playbooks/build/projects/gtk-vnc+mingw32.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: gtk-vnc+mingw32 + machines: '{{ mingw_machines }}' + archive_format: gz + git_url: '{{ git_urls["gtk-vnc"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' + vars: + local_env: '{{ mingw32_local_env }}' + autogen_args: '{{ mingw32_autogen_args }}' diff --git a/guests/playbooks/build/projects/gtk-vnc+mingw64.yml b/guests/playbooks/build/projects/gtk-vnc+mingw64.yml new file mode 100644 index 0000000..1cbc75c --- /dev/null +++ b/guests/playbooks/build/projects/gtk-vnc+mingw64.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: gtk-vnc+mingw64 + machines: '{{ mingw_machines }}' + archive_format: gz + git_url: '{{ git_urls["gtk-vnc"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' + vars: + local_env: '{{ mingw64_local_env }}' + autogen_args: '{{ mingw64_autogen_args }}' diff --git a/guests/playbooks/build/projects/gtk-vnc.yml b/guests/playbooks/build/projects/gtk-vnc.yml new file mode 100644 index 0000000..0c5e682 --- /dev/null +++ b/guests/playbooks/build/projects/gtk-vnc.yml @@ -0,0 +1,12 @@ +--- +- set_fact: + name: gtk-vnc + machines: '{{ all_machines }}' + archive_format: gz + git_url: '{{ git_urls["gtk-vnc"][git_remote] }}' + +- include: '{{ playbook_base }}/jobs/prepare.yml' +- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' +- include: '{{ playbook_base }}/jobs/autotools-syntax-check-job.yml' +- include: '{{ playbook_base }}/jobs/autotools-check-job.yml' +- include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml' diff --git a/guests/vars/projects/gtk-vnc+mingw32.yml b/guests/vars/projects/gtk-vnc+mingw32.yml new file mode 100644 index 0000000..e4967f9 --- /dev/null +++ b/guests/vars/projects/gtk-vnc+mingw32.yml @@ -0,0 +1,6 @@ +--- +packages: + - mingw32-glib2 + - mingw32-gnutls + - mingw32-gtk3 + - mingw32-libgcrypt diff --git a/guests/vars/projects/gtk-vnc+mingw64.yml b/guests/vars/projects/gtk-vnc+mingw64.yml new file mode 100644 index 0000000..c870014 --- /dev/null +++ b/guests/vars/projects/gtk-vnc+mingw64.yml @@ -0,0 +1,6 @@ +--- +packages: + - mingw64-glib2 + - mingw64-gnutls + - mingw64-gtk3 + - mingw64-libgcrypt diff --git a/guests/vars/projects/gtk-vnc.yml b/guests/vars/projects/gtk-vnc.yml new file mode 100644 index 0000000..5698a6f --- /dev/null +++ b/guests/vars/projects/gtk-vnc.yml @@ -0,0 +1,11 @@ +--- +packages: + - cyrus-sasl + - glib2 + - gnutls + - gobject-introspection + - gtk3 + - intltool + - libgcrypt + - pulseaudio + - vala diff --git a/jenkins/jobs/defaults.yaml b/jenkins/jobs/defaults.yaml index e5e4c16..7fb6d68 100644 --- a/jenkins/jobs/defaults.yaml +++ b/jenkins/jobs/defaults.yaml @@ -38,6 +38,8 @@ export PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" mingw64_autogen_args: --host=x86_64-w64-mingw32 git_urls: + gtk-vnc: + default: https://gitlab.gnome.org/GNOME/gtk-vnc.git libosinfo: default: https://gitlab.com/libosinfo/libosinfo.git libvirt-cim: diff --git a/jenkins/projects/gtk-vnc+mingw32.yaml b/jenkins/projects/gtk-vnc+mingw32.yaml new file mode 100644 index 0000000..ede09c6 --- /dev/null +++ b/jenkins/projects/gtk-vnc+mingw32.yaml @@ -0,0 +1,11 @@ +--- +- project: + name: gtk-vnc+mingw32 + machines: '{mingw_machines}' + title: GTK-VNC MinGW (32-bit) + archive_format: gz + git_url: '{git_urls[gtk-vnc][default]}' + jobs: + - autotools-build-job: + local_env: '{mingw32_local_env}' + autogen_args: '{mingw32_autogen_args}' diff --git a/jenkins/projects/gtk-vnc+mingw64.yaml b/jenkins/projects/gtk-vnc+mingw64.yaml new file mode 100644 index 0000000..5f00932 --- /dev/null +++ b/jenkins/projects/gtk-vnc+mingw64.yaml @@ -0,0 +1,11 @@ +--- +- project: + name: gtk-vnc+mingw64 + machines: '{mingw_machines}' + title: GTK-VNC MinGW (64-bit) + archive_format: gz + git_url: '{git_urls[gtk-vnc][default]}' + jobs: + - autotools-build-job: + local_env: '{mingw64_local_env}' + autogen_args: '{mingw64_autogen_args}' diff --git a/jenkins/projects/gtk-vnc.yaml b/jenkins/projects/gtk-vnc.yaml new file mode 100644 index 0000000..96f18c3 --- /dev/null +++ b/jenkins/projects/gtk-vnc.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: gtk-vnc + machines: '{all_machines}' + title: GTK-VNC + archive_format: gz + git_url: '{git_urls[gtk-vnc][default]}' + jobs: + - autotools-build-job: + - autotools-syntax-check-job: + parent_jobs: 'gtk-vnc-build' + - autotools-check-job: + parent_jobs: 'gtk-vnc-syntax-check' + - autotools-rpm-job: + parent_jobs: 'gtk-vnc-check' -- 2.21.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list