[libvirt] [jenkins-ci PATCH 0/7] several fixes
Pavel Hrdina (7): projects: make sure that we use correct make for all projects projects: run RPM builds only on systems where it makes sense projects: build osinfo-db on debian-8 jobs: projects: be explicit about python2 binary guests: install unzip for virt-manager guests: install libgovirt-devel on all RPM based distros projects: disable libvirt-sandbox on centos-7 guests/vars/mappings.yml | 6 +++++- guests/vars/projects/virt-manager.yml | 1 + jobs/python-distutils.yaml | 8 ++++---- projects/libosinfo.yaml | 5 +++++ projects/libvirt-cim.yaml | 8 +++++--- projects/libvirt-glib.yaml | 5 +++++ projects/libvirt-perl.yaml | 6 ++++++ projects/libvirt-python.yaml | 6 ++++++ projects/libvirt-sandbox.yaml | 5 ++++- projects/libvirt-tck.yaml | 4 ++++ projects/osinfo-db-tools.yaml | 5 +++++ projects/osinfo-db.yaml | 16 ++++++++++++---- projects/virt-manager.yaml | 7 ++++++- projects/virt-viewer.yaml | 3 +++ 14 files changed, 71 insertions(+), 14 deletions(-) -- 2.13.6
On FreeBSD we need to use gmake. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- projects/libvirt-cim.yaml | 8 +++++--- projects/osinfo-db.yaml | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/projects/libvirt-cim.yaml b/projects/libvirt-cim.yaml index e1c8fb1..b5405f3 100644 --- a/projects/libvirt-cim.yaml +++ b/projects/libvirt-cim.yaml @@ -12,12 +12,14 @@ - generic-build-job: parent_jobs: 'libvirt-master-build' command: | + {make_env} ./autogen.sh ./configure --prefix=$VIRT_PREFIX - make -j{smp} - make -j{smp} install + $MAKE -j{smp} + $MAKE -j{smp} install - generic-rpm-job: parent_jobs: 'libvirt-cim-master-build' command: | + {make_env} sed -i -e "s/.*libvirt-devel.*//" libvirt-cim.spec.in - make -j{smp} rpm + $MAKE -j{smp} rpm diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 9fec36a..169c76b 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -14,14 +14,16 @@ - generic-build-job: parent_jobs: 'osinfo-db-tools-master-build' command: | + {make_env} export PATH=$VIRT_PREFIX/bin:$PATH - make -j3 all - make install OSINFO_DB_TARGET="--system" + $MAKE -j3 all + $MAKE install OSINFO_DB_TARGET="--system" - generic-rpm-job: parent_jobs: 'osinfo-db-master-build' command: | + {make_env} export PATH=$VIRT_PREFIX/bin:$PATH rm -f *.tar.xz - make osinfo-db.spec + $MAKE osinfo-db.spec perl -i -p -e 's/BuildRequires: osinfo-db-tools.*//' osinfo-db.spec - make rpm + $MAKE rpm -- 2.13.6
On Wed, 2017-11-01 at 14:26 +0100, Pavel Hrdina wrote:
On FreeBSD we need to use gmake.
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- projects/libvirt-cim.yaml | 8 +++++--- projects/osinfo-db.yaml | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/projects/libvirt-cim.yaml b/projects/libvirt-cim.yaml index e1c8fb1..b5405f3 100644 --- a/projects/libvirt-cim.yaml +++ b/projects/libvirt-cim.yaml @@ -12,12 +12,14 @@ - generic-build-job: parent_jobs: 'libvirt-master-build' command: | + {make_env} ./autogen.sh ./configure --prefix=$VIRT_PREFIX - make -j{smp} - make -j{smp} install + $MAKE -j{smp} + $MAKE -j{smp} install - generic-rpm-job: parent_jobs: 'libvirt-cim-master-build' command: | + {make_env} sed -i -e "s/.*libvirt-devel.*//" libvirt-cim.spec.in - make -j{smp} rpm + $MAKE -j{smp} rpm
This is good, but you also need the same changes in jobs/perl-makemaker.yaml or libvirt-perl builds will fail on FreeBSD. With that taken care of, Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- projects/libosinfo.yaml | 5 +++++ projects/libvirt-glib.yaml | 5 +++++ projects/libvirt-perl.yaml | 6 ++++++ projects/libvirt-python.yaml | 6 ++++++ projects/libvirt-sandbox.yaml | 5 +++++ projects/libvirt-tck.yaml | 4 ++++ projects/osinfo-db-tools.yaml | 5 +++++ projects/osinfo-db.yaml | 5 +++++ projects/virt-manager.yaml | 5 +++++ projects/virt-viewer.yaml | 3 +++ 10 files changed, 49 insertions(+) diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml index 5f703b8..9ab2281 100644 --- a/projects/libosinfo.yaml +++ b/projects/libosinfo.yaml @@ -22,3 +22,8 @@ parent_jobs: 'libosinfo-master-syntax-check' - autotools-rpm-job: parent_jobs: 'libosinfo-master-check' + machines: + - libvirt-centos-7 + - libvirt-fedora-25 + - libvirt-fedora-26 + - libvirt-fedora-rawhide diff --git a/projects/libvirt-glib.yaml b/projects/libvirt-glib.yaml index e82dbcc..855abd2 100644 --- a/projects/libvirt-glib.yaml +++ b/projects/libvirt-glib.yaml @@ -21,3 +21,8 @@ parent_jobs: 'libvirt-glib-master-syntax-check' - autotools-rpm-job: parent_jobs: 'libvirt-glib-master-check' + machines: + - libvirt-centos-7 + - libvirt-fedora-25 + - libvirt-fedora-26 + - libvirt-fedora-rawhide diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index 5c314ec..77bc4ea 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -20,3 +20,9 @@ test_args: 'TEST_MAINTAINER=1' - perl-makemaker-rpm-job: parent_jobs: 'libvirt-perl-master-test' + machines: + - libvirt-centos-6 + - libvirt-centos-7 + - libvirt-fedora-25 + - libvirt-fedora-26 + - libvirt-fedora-rawhide diff --git a/projects/libvirt-python.yaml b/projects/libvirt-python.yaml index de916aa..c0ba338 100644 --- a/projects/libvirt-python.yaml +++ b/projects/libvirt-python.yaml @@ -19,3 +19,9 @@ parent_jobs: 'libvirt-python-master-build' - python-distutils-rpm-job: parent_jobs: 'libvirt-python-master-check' + machines: + - libvirt-centos-6 + - libvirt-centos-7 + - libvirt-fedora-25 + - libvirt-fedora-26 + - libvirt-fedora-rawhide diff --git a/projects/libvirt-sandbox.yaml b/projects/libvirt-sandbox.yaml index 9d6add8..71ab1c7 100644 --- a/projects/libvirt-sandbox.yaml +++ b/projects/libvirt-sandbox.yaml @@ -18,3 +18,8 @@ parent_jobs: 'libvirt-sandbox-master-syntax-check' - autotools-rpm-job: parent_jobs: 'libvirt-sandbox-master-check' + machines: + - libvirt-centos-7 + - libvirt-fedora-25 + - libvirt-fedora-26 + - libvirt-fedora-rawhide diff --git a/projects/libvirt-tck.yaml b/projects/libvirt-tck.yaml index 29340cb..a5caadd 100644 --- a/projects/libvirt-tck.yaml +++ b/projects/libvirt-tck.yaml @@ -17,3 +17,7 @@ parent_jobs: 'libvirt-tck-master-build' - perl-modulebuild-rpm-job: parent_jobs: 'libvirt-tck-master-test' + machines: + - libvirt-fedora-25 + - libvirt-fedora-26 + - libvirt-fedora-rawhide diff --git a/projects/osinfo-db-tools.yaml b/projects/osinfo-db-tools.yaml index ca656ee..4abd65e 100644 --- a/projects/osinfo-db-tools.yaml +++ b/projects/osinfo-db-tools.yaml @@ -20,3 +20,8 @@ parent_jobs: 'osinfo-db-tools-master-syntax-check' - autotools-rpm-job: parent_jobs: 'osinfo-db-tools-master-check' + machines: + - libvirt-centos-7 + - libvirt-fedora-25 + - libvirt-fedora-26 + - libvirt-fedora-rawhide diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 169c76b..961ad64 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -20,6 +20,11 @@ $MAKE install OSINFO_DB_TARGET="--system" - generic-rpm-job: parent_jobs: 'osinfo-db-master-build' + machines: + - libvirt-centos-7 + - libvirt-fedora-25 + - libvirt-fedora-26 + - libvirt-fedora-rawhide command: | {make_env} export PATH=$VIRT_PREFIX/bin:$PATH diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index ecfd497..2f65b47 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -22,3 +22,8 @@ parent_jobs: 'virt-manager-master-build' - python-distutils-rpm-job: parent_jobs: 'virt-manager-master-check' + machines: + - libvirt-centos-7 + - libvirt-fedora-25 + - libvirt-fedora-26 + - libvirt-fedora-rawhide diff --git a/projects/virt-viewer.yaml b/projects/virt-viewer.yaml index 9726119..9735cc7 100644 --- a/projects/virt-viewer.yaml +++ b/projects/virt-viewer.yaml @@ -21,4 +21,7 @@ - autotools-rpm-job: parent_jobs: 'virt-viewer-master-check' machines: + - libvirt-centos-7 + - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide -- 2.13.6
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- projects/osinfo-db.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 961ad64..9a7d5e1 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -3,6 +3,7 @@ name: osinfo-db machines: - libvirt-centos-7 + - libvirt-debian-8 - libvirt-debian-9 - libvirt-fedora-25 - libvirt-fedora-26 -- 2.13.6
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- jobs/python-distutils.yaml | 8 ++++---- projects/virt-manager.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index b7dbb1d..7055d26 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -41,8 +41,8 @@ builders: - shell: | {command_pre_build} - python setup.py build - python setup.py install --prefix=$VIRT_PREFIX + python2 setup.py build + python2 setup.py install --prefix=$VIRT_PREFIX publishers: - email: recipients: '{obj:spam}' @@ -79,7 +79,7 @@ values: '{obj:machines}' builders: - shell: | - python setup.py test + python2 setup.py test publishers: - email: recipients: '{obj:spam}' @@ -116,7 +116,7 @@ builders: - shell: | sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in - python setup.py rpm + python2 setup.py rpm publishers: - email: recipients: '{obj:spam}' diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index 2f65b47..63458c5 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -17,7 +17,7 @@ - 'libvirt-python-master-build' - 'libosinfo-master-build' command_pre_build: | - python setup.py configure --prefix=$VIRT_PREFIX + python2 setup.py configure --prefix=$VIRT_PREFIX - python-distutils-check-job: parent_jobs: 'virt-manager-master-build' - python-distutils-rpm-job: -- 2.13.6
On Wed, Nov 01, 2017 at 02:26:56PM +0100, Pavel Hrdina wrote:
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- jobs/python-distutils.yaml | 8 ++++---- projects/virt-manager.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index b7dbb1d..7055d26 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -41,8 +41,8 @@ builders: - shell: | {command_pre_build} - python setup.py build - python setup.py install --prefix=$VIRT_PREFIX + python2 setup.py build + python2 setup.py install --prefix=$VIRT_PREFIX publishers: - email: recipients: '{obj:spam}' @@ -79,7 +79,7 @@ values: '{obj:machines}' builders: - shell: | - python setup.py test + python2 setup.py test publishers: - email: recipients: '{obj:spam}' @@ -116,7 +116,7 @@ builders: - shell: | sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in - python setup.py rpm + python2 setup.py rpm publishers: - email: recipients: '{obj:spam}'
Hmm, for libvirt-python bindings we ought to make sure we have two sets of build jobs - once for py2 and once for py3. So, we ought to make the choice of python binary a variable we pass in. 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 :|
On Wed, Nov 01, 2017 at 01:37:12PM +0000, Daniel P. Berrange wrote:
On Wed, Nov 01, 2017 at 02:26:56PM +0100, Pavel Hrdina wrote:
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- jobs/python-distutils.yaml | 8 ++++---- projects/virt-manager.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index b7dbb1d..7055d26 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -41,8 +41,8 @@ builders: - shell: | {command_pre_build} - python setup.py build - python setup.py install --prefix=$VIRT_PREFIX + python2 setup.py build + python2 setup.py install --prefix=$VIRT_PREFIX publishers: - email: recipients: '{obj:spam}' @@ -79,7 +79,7 @@ values: '{obj:machines}' builders: - shell: | - python setup.py test + python2 setup.py test publishers: - email: recipients: '{obj:spam}' @@ -116,7 +116,7 @@ builders: - shell: | sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in - python setup.py rpm + python2 setup.py rpm publishers: - email: recipients: '{obj:spam}'
Hmm, for libvirt-python bindings we ought to make sure we have two sets of build jobs - once for py2 and once for py3. So, we ought to make the choice of python binary a variable we pass in.
Right and we will have to do that for virt-manager as well once it is ported to work with python2 and python3. I would say that having python2 is good enough for now. Pavel
On Wed, Nov 01, 2017 at 02:47:30PM +0100, Pavel Hrdina wrote:
On Wed, Nov 01, 2017 at 01:37:12PM +0000, Daniel P. Berrange wrote:
On Wed, Nov 01, 2017 at 02:26:56PM +0100, Pavel Hrdina wrote:
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- jobs/python-distutils.yaml | 8 ++++---- projects/virt-manager.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index b7dbb1d..7055d26 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -41,8 +41,8 @@ builders: - shell: | {command_pre_build} - python setup.py build - python setup.py install --prefix=$VIRT_PREFIX + python2 setup.py build + python2 setup.py install --prefix=$VIRT_PREFIX publishers: - email: recipients: '{obj:spam}' @@ -79,7 +79,7 @@ values: '{obj:machines}' builders: - shell: | - python setup.py test + python2 setup.py test publishers: - email: recipients: '{obj:spam}' @@ -116,7 +116,7 @@ builders: - shell: | sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in - python setup.py rpm + python2 setup.py rpm publishers: - email: recipients: '{obj:spam}'
Hmm, for libvirt-python bindings we ought to make sure we have two sets of build jobs - once for py2 and once for py3. So, we ought to make the choice of python binary a variable we pass in.
Right and we will have to do that for virt-manager as well once it is ported to work with python2 and python3. I would say that having python2 is good enough for now.
Sure, it can be done as a separate patch. 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 :|
It's used by virt-manager tests. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- guests/vars/mappings.yml | 4 ++++ guests/vars/projects/virt-manager.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index e78277a..b2c1748 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -631,6 +631,10 @@ mappings: rpm: spice-gtk3-devel CentOS6: + unzip: + default: unzip + FreeBSD: + usb-ids: default: hwdata FreeBSD: usbids diff --git a/guests/vars/projects/virt-manager.yml b/guests/vars/projects/virt-manager.yml index 29bacb4..474017f 100644 --- a/guests/vars/projects/virt-manager.yml +++ b/guests/vars/projects/virt-manager.yml @@ -5,3 +5,4 @@ packages: - python2-ipaddr - python2-libxml2 - python2-requests + - unzip -- 2.13.6
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- guests/vars/mappings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index b2c1748..eca8dbe 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -220,8 +220,8 @@ mappings: rpm: dbus-devel libgovirt: + rpm: libgovirt-devel Debian: libgovirt-dev - Fedora: libgovirt-devel Debian8: libnl: -- 2.13.6
There is no xz-static available. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- projects/libvirt-sandbox.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/libvirt-sandbox.yaml b/projects/libvirt-sandbox.yaml index 71ab1c7..28f7085 100644 --- a/projects/libvirt-sandbox.yaml +++ b/projects/libvirt-sandbox.yaml @@ -2,7 +2,6 @@ - project: name: libvirt-sandbox machines: - - libvirt-centos-7 - libvirt-debian-9 - libvirt-fedora-25 - libvirt-fedora-26 @@ -19,7 +18,6 @@ - autotools-rpm-job: parent_jobs: 'libvirt-sandbox-master-check' machines: - - libvirt-centos-7 - libvirt-fedora-25 - libvirt-fedora-26 - libvirt-fedora-rawhide -- 2.13.6
On Wed, 2017-11-01 at 14:26 +0100, Pavel Hrdina wrote:
Pavel Hrdina (7): projects: make sure that we use correct make for all projects projects: run RPM builds only on systems where it makes sense projects: build osinfo-db on debian-8 jobs: projects: be explicit about python2 binary guests: install unzip for virt-manager guests: install libgovirt-devel on all RPM based distros projects: disable libvirt-sandbox on centos-7
guests/vars/mappings.yml | 6 +++++- guests/vars/projects/virt-manager.yml | 1 + jobs/python-distutils.yaml | 8 ++++---- projects/libosinfo.yaml | 5 +++++ projects/libvirt-cim.yaml | 8 +++++--- projects/libvirt-glib.yaml | 5 +++++ projects/libvirt-perl.yaml | 6 ++++++ projects/libvirt-python.yaml | 6 ++++++ projects/libvirt-sandbox.yaml | 5 ++++- projects/libvirt-tck.yaml | 4 ++++ projects/osinfo-db-tools.yaml | 5 +++++ projects/osinfo-db.yaml | 16 ++++++++++++---- projects/virt-manager.yaml | 7 ++++++- projects/virt-viewer.yaml | 3 +++ 14 files changed, 71 insertions(+), 14 deletions(-)
For all patches except 1/7, Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization
On Wed, Nov 01, 2017 at 02:40:13PM +0100, Andrea Bolognani wrote:
On Wed, 2017-11-01 at 14:26 +0100, Pavel Hrdina wrote:
Pavel Hrdina (7): projects: make sure that we use correct make for all projects projects: run RPM builds only on systems where it makes sense projects: build osinfo-db on debian-8 jobs: projects: be explicit about python2 binary guests: install unzip for virt-manager guests: install libgovirt-devel on all RPM based distros projects: disable libvirt-sandbox on centos-7
guests/vars/mappings.yml | 6 +++++- guests/vars/projects/virt-manager.yml | 1 + jobs/python-distutils.yaml | 8 ++++---- projects/libosinfo.yaml | 5 +++++ projects/libvirt-cim.yaml | 8 +++++--- projects/libvirt-glib.yaml | 5 +++++ projects/libvirt-perl.yaml | 6 ++++++ projects/libvirt-python.yaml | 6 ++++++ projects/libvirt-sandbox.yaml | 5 ++++- projects/libvirt-tck.yaml | 4 ++++ projects/osinfo-db-tools.yaml | 5 +++++ projects/osinfo-db.yaml | 16 ++++++++++++---- projects/virt-manager.yaml | 7 ++++++- projects/virt-viewer.yaml | 3 +++ 14 files changed, 71 insertions(+), 14 deletions(-)
For all patches except 1/7,
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Thanks, I fixed the 1/7 and pushed the series. Pavel
participants (3)
-
Andrea Bolognani -
Daniel P. Berrange -
Pavel Hrdina