[libvirt] [jenkins-ci PATCH 0/2] Re-introduce Ubuntu 16.04
See commit 1/2 for the explanation. Andrea Bolognani (2): guests: Re-introduce Ubuntu 16.04 Start building on Ubuntu 16.04 once again guests/host_vars/libvirt-ubuntu-16/docker.yml | 2 ++ .../host_vars/libvirt-ubuntu-16/install.yml | 2 ++ guests/host_vars/libvirt-ubuntu-16/main.yml | 22 +++++++++++++++++++ guests/inventory | 1 + guests/playbooks/build/jobs/defaults.yml | 1 + .../playbooks/build/projects/libvirt-dbus.yml | 5 ++++- .../build/projects/libvirt-go-xml.yml | 1 + .../playbooks/build/projects/libvirt-go.yml | 1 + .../build/projects/libvirt-ocaml.yml | 1 + .../build/projects/libvirt-sandbox.yml | 1 + .../playbooks/build/projects/libvirt-tck.yml | 1 + guests/playbooks/build/projects/libvirt.yml | 1 + guests/playbooks/build/projects/osinfo-db.yml | 1 + .../playbooks/build/projects/virt-manager.yml | 4 +++- guests/vars/mappings.yml | 3 +++ 15 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 guests/host_vars/libvirt-ubuntu-16/docker.yml create mode 100644 guests/host_vars/libvirt-ubuntu-16/install.yml create mode 100644 guests/host_vars/libvirt-ubuntu-16/main.yml -- 2.21.0
According to our platform support policy[1], we support an Ubuntu LTS release for two years after the *following* LTS has been released, which means that Ubuntu 16.04 is going to be an official target for almost one more year. This reverts commit c6c648534dd1. [1] https://libvirt.org/platforms.html Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/host_vars/libvirt-ubuntu-16/docker.yml | 2 ++ .../host_vars/libvirt-ubuntu-16/install.yml | 2 ++ guests/host_vars/libvirt-ubuntu-16/main.yml | 22 +++++++++++++++++++ guests/inventory | 1 + guests/vars/mappings.yml | 3 +++ 5 files changed, 30 insertions(+) create mode 100644 guests/host_vars/libvirt-ubuntu-16/docker.yml create mode 100644 guests/host_vars/libvirt-ubuntu-16/install.yml create mode 100644 guests/host_vars/libvirt-ubuntu-16/main.yml diff --git a/guests/host_vars/libvirt-ubuntu-16/docker.yml b/guests/host_vars/libvirt-ubuntu-16/docker.yml new file mode 100644 index 0000000..2d4eb25 --- /dev/null +++ b/guests/host_vars/libvirt-ubuntu-16/docker.yml @@ -0,0 +1,2 @@ +--- +docker_base: ubuntu:16.04 diff --git a/guests/host_vars/libvirt-ubuntu-16/install.yml b/guests/host_vars/libvirt-ubuntu-16/install.yml new file mode 100644 index 0000000..d8ce841 --- /dev/null +++ b/guests/host_vars/libvirt-ubuntu-16/install.yml @@ -0,0 +1,2 @@ +--- +install_url: http://archive.ubuntu.com/ubuntu/dists/xenial/main/installer-amd64/ diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml new file mode 100644 index 0000000..0e38128 --- /dev/null +++ b/guests/host_vars/libvirt-ubuntu-16/main.yml @@ -0,0 +1,22 @@ +--- +projects: + - libosinfo + - libvirt + - libvirt-dbus + - libvirt-glib + - libvirt-go + - libvirt-go-xml + - libvirt-ocaml + - libvirt-perl + - libvirt-python + - libvirt-sandbox + - libvirt-tck + - osinfo-db + - osinfo-db-tools + - virt-viewer + +package_format: 'deb' +os_name: 'Ubuntu' +os_version: '16' + +ansible_python_interpreter: /usr/bin/python3 diff --git a/guests/inventory b/guests/inventory index 5b01d58..48abe95 100644 --- a/guests/inventory +++ b/guests/inventory @@ -8,4 +8,5 @@ libvirt-fedora-rawhide libvirt-freebsd-11 libvirt-freebsd-12 libvirt-freebsd-current +libvirt-ubuntu-16 libvirt-ubuntu-18 diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index c821a89..4a231c3 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -196,6 +196,7 @@ mappings: deb: libglusterfs-dev rpm: glusterfs-api-devel Debian9: glusterfs-common + Ubuntu16: glusterfs-common Ubuntu18: glusterfs-common cross-policy-deb: foreign @@ -227,6 +228,7 @@ mappings: gtk-update-icon-cache: default: gtk-update-icon-cache + Ubuntu16: libgtk2.0-bin gtk-vnc2: deb: libgtk-vnc-2.0-dev @@ -815,6 +817,7 @@ mappings: default: python3-libxml2 FreeBSD: py36-libxml2 CentOS7: + Ubuntu16: python3-lxml: default: python3-lxml -- 2.21.0
This reverts commit 008ed7e28f6e. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/playbooks/build/jobs/defaults.yml | 1 + guests/playbooks/build/projects/libvirt-dbus.yml | 5 ++++- guests/playbooks/build/projects/libvirt-go-xml.yml | 1 + guests/playbooks/build/projects/libvirt-go.yml | 1 + guests/playbooks/build/projects/libvirt-ocaml.yml | 1 + guests/playbooks/build/projects/libvirt-sandbox.yml | 1 + guests/playbooks/build/projects/libvirt-tck.yml | 1 + guests/playbooks/build/projects/libvirt.yml | 1 + guests/playbooks/build/projects/osinfo-db.yml | 1 + guests/playbooks/build/projects/virt-manager.yml | 4 +++- 10 files changed, 15 insertions(+), 2 deletions(-) diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/build/jobs/defaults.yml index 48c44ed..54f3cb6 100644 --- a/guests/playbooks/build/jobs/defaults.yml +++ b/guests/playbooks/build/jobs/defaults.yml @@ -10,6 +10,7 @@ all_machines: - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current + - libvirt-ubuntu-16 - libvirt-ubuntu-18 rpm_machines: - libvirt-centos-7 diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/playbooks/build/projects/libvirt-dbus.yml index 59ef603..a6ff025 100644 --- a/guests/playbooks/build/projects/libvirt-dbus.yml +++ b/guests/playbooks/build/projects/libvirt-dbus.yml @@ -12,6 +12,7 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current + - libvirt-ubuntu-16 - libvirt-ubuntu-18 archive_format: xz git_url: '{{ git_urls["libvirt-dbus"][git_remote] }}' @@ -30,10 +31,12 @@ - libvirt-fedora-29 - libvirt-fedora-30 - libvirt-fedora-rawhide + - libvirt-ubuntu-16 - libvirt-ubuntu-18 - include: '{{ playbook_base }}/jobs/autotools-check-job.yml' vars: - # CentOS 7 doesn't include Python 3 + # CentOS 7 doesn't include Python 3 and the version in Ubuntu + # 16.04 is too old machines: - libvirt-debian-9 - libvirt-debian-10 diff --git a/guests/playbooks/build/projects/libvirt-go-xml.yml b/guests/playbooks/build/projects/libvirt-go-xml.yml index a800e22..cb14620 100644 --- a/guests/playbooks/build/projects/libvirt-go-xml.yml +++ b/guests/playbooks/build/projects/libvirt-go-xml.yml @@ -11,6 +11,7 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current + - libvirt-ubuntu-16 - libvirt-ubuntu-18 archive_format: gz git_url: '{{ git_urls["libvirt-go-xml"][git_remote] }}' diff --git a/guests/playbooks/build/projects/libvirt-go.yml b/guests/playbooks/build/projects/libvirt-go.yml index 35ada3c..fad5279 100644 --- a/guests/playbooks/build/projects/libvirt-go.yml +++ b/guests/playbooks/build/projects/libvirt-go.yml @@ -11,6 +11,7 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current + - libvirt-ubuntu-16 - libvirt-ubuntu-18 archive_format: gz git_url: '{{ git_urls["libvirt-go"][git_remote] }}' diff --git a/guests/playbooks/build/projects/libvirt-ocaml.yml b/guests/playbooks/build/projects/libvirt-ocaml.yml index 7f20417..7a2e216 100644 --- a/guests/playbooks/build/projects/libvirt-ocaml.yml +++ b/guests/playbooks/build/projects/libvirt-ocaml.yml @@ -12,6 +12,7 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current + - libvirt-ubuntu-16 - libvirt-ubuntu-18 archive_format: xz git_url: '{{ git_urls["libvirt-ocaml"][git_remote] }}' diff --git a/guests/playbooks/build/projects/libvirt-sandbox.yml b/guests/playbooks/build/projects/libvirt-sandbox.yml index 53a0f59..85b72a5 100644 --- a/guests/playbooks/build/projects/libvirt-sandbox.yml +++ b/guests/playbooks/build/projects/libvirt-sandbox.yml @@ -11,6 +11,7 @@ - libvirt-fedora-29 - libvirt-fedora-30 - libvirt-fedora-rawhide + - libvirt-ubuntu-16 - libvirt-ubuntu-18 archive_format: gz git_url: '{{ git_urls["libvirt-sandbox"][git_remote] }}' diff --git a/guests/playbooks/build/projects/libvirt-tck.yml b/guests/playbooks/build/projects/libvirt-tck.yml index db758d3..a232c9f 100644 --- a/guests/playbooks/build/projects/libvirt-tck.yml +++ b/guests/playbooks/build/projects/libvirt-tck.yml @@ -11,6 +11,7 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current + - libvirt-ubuntu-16 - libvirt-ubuntu-18 archive_format: gz git_url: '{{ git_urls["libvirt-tck"][git_remote] }}' diff --git a/guests/playbooks/build/projects/libvirt.yml b/guests/playbooks/build/projects/libvirt.yml index 1c7e7c0..bd2ac4c 100644 --- a/guests/playbooks/build/projects/libvirt.yml +++ b/guests/playbooks/build/projects/libvirt.yml @@ -19,6 +19,7 @@ - libvirt-fedora-29 - libvirt-fedora-30 - libvirt-fedora-rawhide + - libvirt-ubuntu-16 - libvirt-ubuntu-18 - include: '{{ playbook_base }}/jobs/autotools-check-job.yml' vars: diff --git a/guests/playbooks/build/projects/osinfo-db.yml b/guests/playbooks/build/projects/osinfo-db.yml index f78cf9e..856e478 100644 --- a/guests/playbooks/build/projects/osinfo-db.yml +++ b/guests/playbooks/build/projects/osinfo-db.yml @@ -24,6 +24,7 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current + - libvirt-ubuntu-16 - libvirt-ubuntu-18 command: | $MAKE check diff --git a/guests/playbooks/build/projects/virt-manager.yml b/guests/playbooks/build/projects/virt-manager.yml index d2e6c25..f955f4c 100644 --- a/guests/playbooks/build/projects/virt-manager.yml +++ b/guests/playbooks/build/projects/virt-manager.yml @@ -1,7 +1,9 @@ --- - set_fact: name: virt-manager - # virt-manager is Python 3 only, so it can't be built on CentOS 7 + # virt-manager is Python 3 only, so it can't be built on CentOS 7; + # Ubuntu 16.04 has Python 3 but not the libxml2 bindings, so it can't + # build the project either machines: - libvirt-debian-9 - libvirt-debian-10 -- 2.21.0
On Tue, Jul 09, 2019 at 05:34:14PM +0200, Andrea Bolognani wrote:
See commit 1/2 for the explanation.
Andrea Bolognani (2): guests: Re-introduce Ubuntu 16.04 Start building on Ubuntu 16.04 once again
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 :|
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé