[libvirt] [jenkins-ci PATCH 0/7] Update libosinfo/osinfo-db-tools dependencies
This patch set updates both libosinfo and osinfo-db-tools deps. The changes done are, basically: libosinfo: - drop gnome-common - drop intltool osinfo-db-tools: - drop gnome-common - drop intltool - add python3 - add python3-pytest - add python3-requests Together with those changes: - gnome-common has been dropped from the mappings as the only consumers were libosinfo and osinfo-db-tools. - `make check` is not ran for CentOS 7 anymore, as the osinfo-db-tools testes depend on python3. Fabiano Fidêncio (7): guests: Drop gnome-common libosinfo's dependency guests: Drop gnome-common osinfo-db-tools' dependency guests: Remove unused "gnome-common" mapping guests: Drop intltool libosinfo's dependency guests: Drop intltool osinfo-db-tools' dependency guests: Update test dependencies for osinfo-db-tools Stop running `make check` against osinfo-db-tools on CentOS 7 guests/playbooks/build/projects/osinfo-db-tools.yml | 10 ++++++++++ guests/vars/mappings.yml | 3 --- guests/vars/projects/libosinfo.yml | 2 -- guests/vars/projects/osinfo-db-tools.yml | 5 +++-- jenkins/projects/osinfo-db-tools.yaml | 12 ++++++++++++ 5 files changed, 25 insertions(+), 7 deletions(-) -- 2.20.1
libosinfo's commit 9631ef7d87 dropped gnome-common dependency. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/projects/libosinfo.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/guests/vars/projects/libosinfo.yml b/guests/vars/projects/libosinfo.yml index 4297110..3f95105 100644 --- a/guests/vars/projects/libosinfo.yml +++ b/guests/vars/projects/libosinfo.yml @@ -2,7 +2,6 @@ packages: - check - glib2 - - gnome-common - gobject-introspection - gtk-doc - intltool -- 2.20.1
osinfo-db-tool's commit 1f13eea3e dropped gnome-common dependency. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/projects/osinfo-db-tools.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/guests/vars/projects/osinfo-db-tools.yml b/guests/vars/projects/osinfo-db-tools.yml index 07d9bd4..e70e6f8 100644 --- a/guests/vars/projects/osinfo-db-tools.yml +++ b/guests/vars/projects/osinfo-db-tools.yml @@ -1,7 +1,6 @@ --- packages: - glib2 - - gnome-common - intltool - json-glib - libarchive -- 2.20.1
libosinfo and osinfo-db-tools were the only two projects depending on gnome-common and, currently, they no longer depend on it. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/mappings.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 22c757e..05d312d 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -200,9 +200,6 @@ mappings: Ubuntu18: glusterfs-common cross-policy-deb: foreign - gnome-common: - default: gnome-common - gnutls: deb: libgnutls28-dev pkg: gnutls -- 2.20.1
libosinfo's commit 3a2dd3050 dropped intltool dependency. signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/projects/libosinfo.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/guests/vars/projects/libosinfo.yml b/guests/vars/projects/libosinfo.yml index 3f95105..d95c4a4 100644 --- a/guests/vars/projects/libosinfo.yml +++ b/guests/vars/projects/libosinfo.yml @@ -4,7 +4,6 @@ packages: - glib2 - gobject-introspection - gtk-doc - - intltool - libcurl - libsoup - libxml2 -- 2.20.1
On Mon, 2019-04-08 at 14:01 +0200, Fabiano Fidêncio wrote:
libosinfo's commit 3a2dd3050 dropped intltool dependency.
signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Note the lower-case "s" at the start: our commit hook prevented me from pushing until I fixed it manually. -- Andrea Bolognani / Red Hat / Virtualization
osinfo-db-tools' commit 00abe3eb4e dropped intltool dependency. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/projects/osinfo-db-tools.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/guests/vars/projects/osinfo-db-tools.yml b/guests/vars/projects/osinfo-db-tools.yml index e70e6f8..1fa607f 100644 --- a/guests/vars/projects/osinfo-db-tools.yml +++ b/guests/vars/projects/osinfo-db-tools.yml @@ -1,7 +1,6 @@ --- packages: - glib2 - - intltool - json-glib - libarchive - libxml2 -- 2.20.1
The new dependencies are: - python3 - python3-pytest - python3-requests Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/vars/projects/osinfo-db-tools.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guests/vars/projects/osinfo-db-tools.yml b/guests/vars/projects/osinfo-db-tools.yml index 1fa607f..773ad93 100644 --- a/guests/vars/projects/osinfo-db-tools.yml +++ b/guests/vars/projects/osinfo-db-tools.yml @@ -5,3 +5,6 @@ packages: - libarchive - libxml2 - libxslt + - python3 + - python3-pytest + - python3-requests -- 2.20.1
osinfo-db-tools tests are Python 3 only. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> --- guests/playbooks/build/projects/osinfo-db-tools.yml | 10 ++++++++++ jenkins/projects/osinfo-db-tools.yaml | 12 ++++++++++++ 2 files changed, 22 insertions(+) diff --git a/guests/playbooks/build/projects/osinfo-db-tools.yml b/guests/playbooks/build/projects/osinfo-db-tools.yml index c5aef9d..e33ea7a 100644 --- a/guests/playbooks/build/projects/osinfo-db-tools.yml +++ b/guests/playbooks/build/projects/osinfo-db-tools.yml @@ -9,6 +9,16 @@ - 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' + vars: + # osinfo-db-tools tests are Python 3 only, so they can't be ran on + # CentOS 7; + machines: + - libvirt-debian-9 + - libvirt-fedora-28 + - libvirt-fedora-29 + - libvirt-fedora-rawhide + - libvirt-freebsd-11 + - libvirt-freebsd-12 - include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml' vars: machines: '{{ rpm_machines }}' diff --git a/jenkins/projects/osinfo-db-tools.yaml b/jenkins/projects/osinfo-db-tools.yaml index 0ff630b..9f738b6 100644 --- a/jenkins/projects/osinfo-db-tools.yaml +++ b/jenkins/projects/osinfo-db-tools.yaml @@ -12,6 +12,18 @@ parent_jobs: 'osinfo-db-tools-build' - autotools-check-job: parent_jobs: 'osinfo-db-tools-syntax-check' + # osinfo-db-tools tests are Python 3 only, so they can't be ran on + # CentOS 7; + machines: + - libvirt-debian-9 + - libvirt-debian-sid + - libvirt-fedora-28 + - libvirt-fedora-29 + - libvirt-fedora-rawhide + - libvirt-freebsd-11 + - libvirt-freebsd-12 + - libvirt-freebsd-current + - libvirt-ubuntu-18 - autotools-rpm-job: parent_jobs: 'osinfo-db-tools-check' machines: '{rpm_machines}' -- 2.20.1
On Mon, 2019-04-08 at 14:01 +0200, Fabiano Fidêncio wrote:
This patch set updates both libosinfo and osinfo-db-tools deps. The changes done are, basically: libosinfo: - drop gnome-common - drop intltool
osinfo-db-tools: - drop gnome-common - drop intltool - add python3 - add python3-pytest - add python3-requests
Together with those changes: - gnome-common has been dropped from the mappings as the only consumers were libosinfo and osinfo-db-tools. - `make check` is not ran for CentOS 7 anymore, as the osinfo-db-tools testes depend on python3.
Reviewed-by: Andrea Bolognani <abologna@redhat.com> and pushed. I'll update Jenkins and the guests in a minute. -- Andrea Bolognani / Red Hat / Virtualization
participants (2)
-
Andrea Bolognani -
Fabiano Fidêncio