#20 EL7 Support Part 1
Closed 8 years ago by mrmeee. Opened 8 years ago by mrmeee.
copr/ mrmeee/copr EL7-Support  into  master

EL7 Support
Martin Juhl • 8 years ago  
EL7 Support
Martin Juhl • 8 years ago  
EL7 Support misc
Martin Juhl • 8 years ago  
EL7 Support misc
Martin Juhl • 8 years ago  
EL7 Support for Copr-backend
Martin Juhl • 8 years ago  
EL7 Support for Copr-mocks
Martin Juhl • 8 years ago  
file modified
+7 -1
@@ -4,7 +4,7 @@ 

  

  Name:       copr-backend

  Version:    1.95

- Release:    1%{?dist}

+ Release:    2%{?dist}

  Summary:    Backend for Copr

  

  Group:      Applications/Productivity
@@ -93,7 +93,10 @@ 

  Requires:   python-lockfile

  Requires:   python2-modulemd

  # Requires:   python-ipdb

+ # EL7 doesn't support "Suggests"

+ %if 0%{?fedora}

  Suggests:   logstash

+ %endif

  Requires:   libappstream-glib-builder >= 0.4.0

  # Requires:   python-plumbum

  Requires:   rpm-sign
@@ -259,6 +262,9 @@ 

  %exclude %{_pkgdocdir}/playbooks

  

  %changelog

+ * Mon Dec 05 2016 Martin Juhl <mj@casalogic.dk> 1.95-2

+ - EL7 Support

+ 

  * Thu Dec 01 2016 clime <clime@redhat.com> 1.95-1

  - use buildroot_pkgs substitution type according to job.chroot

  - use timeout command to respect timeout param coming from frontend

file modified
+12 -1
@@ -1,6 +1,6 @@ 

  Name:       copr-dist-git

  Version:    0.23

- Release:    1%{?dist}

+ Release:    2%{?dist}

  Summary:    Copr services for Dist Git server

  

  Group:      Applications/Productivity
@@ -26,7 +26,11 @@ 

  BuildRequires: pytest

  BuildRequires: python-pytest-cov

  BuildRequires: python-mock

+ %if 0%{?el7}

+ BuildRequires: python-psutil

+ %else

  BuildRequires: python2-psutil

+ %endif

  BuildRequires: pytz

  

  %if 0%{?fedora} > 23
@@ -42,7 +46,11 @@ 

  Requires: dist-git

  Requires: python-bunch

  Requires: python-requests

+ %if 0%{?el7}

+ Requires: python-psutil

+ %else

  Requires: python2-psutil

+ %endif

  Requires: python-jinja2

  Requires: pyrpkg

  Requires: mock-scm
@@ -130,6 +138,9 @@ 

  %ghost %{_var}/log/copr-dist-git/*.log

  

  %changelog

+ * Mon Dec 05 2016 Martin Juhl <mj@casalogic.dk> 0.23-2

+ - EL7 Support

+ 

  * Thu Dec 01 2016 clime <clime@redhat.com> 0.23-1

  - use other than epel chroot for scm building

  - use newest mock

file modified
+12 -2
@@ -1,7 +1,7 @@ 
clime commented 8 years ago

copr-mocks are only for python3 at the moment so requiring python2 packages for epel won't do any good.

Hmmm.. The package builds and seems to work with these dependencies on RHEL/CentOS.. without python3...???

clime commented 8 years ago

I consider that very strange when the main script (app.py) has #!/usr/bin/env python3 at the beginning. How exactly did you test it?

I have just tried installing the package, and the complete system is now running.. there is also installed some python3 packages from the RHSCL... so that might be why it works...

I'll invistigate...

clime commented 8 years ago

copr-mocks (this package) is just for testing purposes. It is used in beaker-tests. So COPR can build without it and no problems.

Ahhh.. that might explain it.. Haven't tested that.. I'll keep to the build-required packages for now..

  Summary: COPR system components mocks

  Name: copr-mocks

  Version: 1.6

- Release: 1%{?dist}

+ Release: 2%{?dist}

  

  # Source is created by:

  # git clone https://git.fedorahosted.org/git/copr.git
@@ -11,11 +11,18 @@ 

  

  License: GPLv2+

  BuildArch: noarch

+ %if 0%{?el7}

+ BuildRequires: python-devel

+ Requires: python

+ Requires: python-flask

+ Requires: python-flask-script

+ %else

  BuildRequires: python3-devel

- BuildRequires: systemd-units

  Requires: python3

  Requires: python3-flask

  Requires: python3-flask-script

+ %endif

+ BuildRequires: systemd-units

  

  %description

  This package provides mocks for individual copr system components
@@ -49,6 +56,9 @@ 

  %{_unitdir}/copr-mocks-frontend.service

  

  %changelog

+ * Mon Dec 05 2016 Martin Juhl <mj@casalogic.dk> 1.6-2

+ - EL7 Support

+ 

  * Thu Dec 01 2016 clime <clime@redhat.com> 1.6-1

  - ignore ValueError exception

  

no initial comment

copr-mocks are only for python3 at the moment so requiring python2 packages for epel won't do any good.

Thank you for this. Support for EPEL7 is something we would like to have. The commits could be squashed into one. And also you could perhaps avoid incrementing the release. These are only minor objections.

Hi

I'm not a experienced git-user.. How do I squash the commits??

In regards to the release numbers... should I just leave them at 1?? and what version should I write in the changelog??

Hmmm.. The package builds and seems to work with these dependencies on RHEL/CentOS.. without python3...???

I'm not very experienced tito user, but I don't usually bump version/release or add changelog. That's done automatically when new tarball is released. I usually do git rebase -i HEAD^^ when I want to squash two commits into one.

I consider that very strange when the main script (app.py) has #!/usr/bin/env python3 at the beginning. How exactly did you test it?

I have just tried installing the package, and the complete system is now running.. there is also installed some python3 packages from the RHSCL... so that might be why it works...

I'll invistigate...

copr-mocks (this package) is just for testing purposes. It is used in beaker-tests. So COPR can build without it and no problems.

Ahhh.. that might explain it.. Haven't tested that.. I'll keep to the build-required packages for now..

I have COPR running on a RHEL7 machine now...

Could we enable build of EL7 packages, so I can see which packages breaks, and correct them???

I have COPR running on a RHEL7 machine now...
Could we enable build of EL7 packages, so I can see which packages breaks, and correct them???

It actually is enabled in @copr/copr-dev. It would be great if building worked in el7!

Ok, great...

I have COPR running here on a RHEL7 machine.. working on commiting the changes (they are minor...)

Pull-Request has been closed by mrmeee

8 years ago