[libvirt] [jenkins-ci PATCH 0/2] Fix project and target list
Andrea Bolognani (2): guests: Fix project list Fix target list for builds guests/host_vars/libvirt-centos-7/main.yml | 1 - guests/host_vars/libvirt-debian-9/main.yml | 2 -- guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/host_vars/libvirt-ubuntu-18/main.yml | 2 -- guests/playbooks/build/projects/osinfo-db.yml | 3 --- guests/playbooks/build/projects/virt-manager.yml | 4 ---- jenkins/projects/osinfo-db.yaml | 1 - jenkins/projects/virt-manager.yaml | 2 -- 8 files changed, 16 deletions(-) -- 2.21.0
We've disabled osinfo-db-tools and libosinfo builds on some targets after they switched to Meson, but while doing so we forgot to also disable osinfo-db and virt-manager, which depend on them. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/host_vars/libvirt-centos-7/main.yml | 1 - guests/host_vars/libvirt-debian-9/main.yml | 2 -- guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/host_vars/libvirt-ubuntu-18/main.yml | 2 -- 4 files changed, 6 deletions(-) diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml index 6156414..4e3ce85 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -7,7 +7,6 @@ projects: - libvirt-ocaml - libvirt-perl - libvirt-python - - osinfo-db - virt-viewer package_format: 'rpm' diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml index cb19395..c388ee8 100644 --- a/guests/host_vars/libvirt-debian-9/main.yml +++ b/guests/host_vars/libvirt-debian-9/main.yml @@ -10,8 +10,6 @@ projects: - libvirt-python - libvirt-sandbox - libvirt-tck - - osinfo-db - - virt-manager - virt-viewer package_format: 'deb' diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml index 0407ae3..bed11d4 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-16/main.yml @@ -10,7 +10,6 @@ projects: - libvirt-python - libvirt-sandbox - libvirt-tck - - osinfo-db - virt-viewer package_format: 'deb' diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars/libvirt-ubuntu-18/main.yml index 4a95f45..199b2bb 100644 --- a/guests/host_vars/libvirt-ubuntu-18/main.yml +++ b/guests/host_vars/libvirt-ubuntu-18/main.yml @@ -10,8 +10,6 @@ projects: - libvirt-python - libvirt-sandbox - libvirt-tck - - osinfo-db - - virt-manager - virt-viewer package_format: 'deb' -- 2.21.0
Targets that don't build osinfo-db-tools and libosinfo should not build osinfo-db and virt-manager. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/playbooks/build/projects/osinfo-db.yml | 3 --- guests/playbooks/build/projects/virt-manager.yml | 4 ---- jenkins/projects/osinfo-db.yaml | 1 - jenkins/projects/virt-manager.yaml | 2 -- 4 files changed, 10 deletions(-) diff --git a/guests/playbooks/build/projects/osinfo-db.yml b/guests/playbooks/build/projects/osinfo-db.yml index 856e478..872b448 100644 --- a/guests/playbooks/build/projects/osinfo-db.yml +++ b/guests/playbooks/build/projects/osinfo-db.yml @@ -15,7 +15,6 @@ vars: # osinfo-db tests are Python 3 only, so they can't be ran on CentOS 7; machines: - - libvirt-debian-9 - libvirt-debian-10 - libvirt-debian-sid - libvirt-fedora-29 @@ -24,8 +23,6 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 command: | $MAKE check - include: '{{ playbook_base }}/jobs/generic-rpm-job.yml' diff --git a/guests/playbooks/build/projects/virt-manager.yml b/guests/playbooks/build/projects/virt-manager.yml index f955f4c..0078fbe 100644 --- a/guests/playbooks/build/projects/virt-manager.yml +++ b/guests/playbooks/build/projects/virt-manager.yml @@ -5,7 +5,6 @@ # 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 - libvirt-debian-sid - libvirt-fedora-29 @@ -14,7 +13,6 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current - - libvirt-ubuntu-18 archive_format: gz git_url: '{{ git_urls["virt-manager"][git_remote] }}' @@ -29,13 +27,11 @@ # so skip the test suite there for the time being. See # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902 machines: - - libvirt-debian-9 - libvirt-debian-10 - libvirt-debian-sid - libvirt-fedora-29 - libvirt-fedora-30 - libvirt-fedora-rawhide - - libvirt-ubuntu-18 - include: '{{ playbook_base }}/jobs/python-distutils-rpm-job.yml' vars: machines: diff --git a/jenkins/projects/osinfo-db.yaml b/jenkins/projects/osinfo-db.yaml index 256c62d..37c1d84 100644 --- a/jenkins/projects/osinfo-db.yaml +++ b/jenkins/projects/osinfo-db.yaml @@ -15,7 +15,6 @@ parent_jobs: 'osinfo-db-build' # osinfo-db tests are Python 3 only, so they can't be ran on CentOS 7; machines: - - libvirt-debian-9 - libvirt-debian-10 - libvirt-fedora-29 - libvirt-fedora-30 diff --git a/jenkins/projects/virt-manager.yaml b/jenkins/projects/virt-manager.yaml index 2577ea9..fe6b903 100644 --- a/jenkins/projects/virt-manager.yaml +++ b/jenkins/projects/virt-manager.yaml @@ -5,7 +5,6 @@ # 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 - libvirt-fedora-29 - libvirt-fedora-30 @@ -28,7 +27,6 @@ # so skip the test suite there for the time being. See # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902 machines: - - libvirt-debian-9 - libvirt-debian-10 - libvirt-fedora-29 - libvirt-fedora-30 -- 2.21.0
On Wed, Oct 2, 2019 at 4:16 PM Andrea Bolognani <abologna@redhat.com> wrote:
Andrea Bolognani (2): guests: Fix project list Fix target list for builds
guests/host_vars/libvirt-centos-7/main.yml | 1 - guests/host_vars/libvirt-debian-9/main.yml | 2 -- guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/host_vars/libvirt-ubuntu-18/main.yml | 2 -- guests/playbooks/build/projects/osinfo-db.yml | 3 --- guests/playbooks/build/projects/virt-manager.yml | 4 ---- jenkins/projects/osinfo-db.yaml | 1 - jenkins/projects/virt-manager.yaml | 2 -- 8 files changed, 16 deletions(-)
-- 2.21.0
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
participants (2)
-
Andrea Bolognani -
Fabiano Fidêncio