1. Patchew
  2. Libvirt
  3. [libvirt] [jenkins-ci PATCH 0/7] several fixes
  4. View patch

[libvirt] [jenkins-ci PATCH 4/7] jobs: projects: be explicit about python2 binary

Pavel Hrdina posted 7 patches 7 years, 6 months ago
[libvirt] [jenkins-ci PATCH 4/7] jobs: projects: be explicit about python2 binary
Posted by Pavel Hrdina 7 years, 6 months ago 
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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [jenkins-ci PATCH 4/7] jobs: projects: be explicit about python2 binary
Posted by Daniel P. Berrange 7 years, 6 months ago 
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 :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [jenkins-ci PATCH 4/7] jobs: projects: be explicit about python2 binary
Posted by Pavel Hrdina 7 years, 6 months ago 
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
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [jenkins-ci PATCH 4/7] jobs: projects: be explicit about python2 binary
Posted by Daniel P. Berrange 7 years, 6 months ago 
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 :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patchew 2.1-devel-8c64711

© 2016 - 2025 Red Hat, Inc.