[copr] master: Automatic commit of package [copr-backend] release [1.33-1]. (f451dbd)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit f451dbd239b1aebec4acfc645c5c2b411c2c579f
Author: Miroslav Suchý <miroslav(a)suchy.cz>
Date: Tue Apr 15 01:09:34 2014 +0200
Automatic commit of package [copr-backend] release [1.33-1].
>---------------------------------------------------------------
backend/copr-backend.spec | 6 +++++-
rel-eng/packages/copr-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec
index 896ead1..a353e9f 100644
--- a/backend/copr-backend.spec
+++ b/backend/copr-backend.spec
@@ -3,7 +3,7 @@
%endif
Name: copr-backend
-Version: 1.32
+Version: 1.33
Release: 1%{?dist}
Summary: Backend for Copr
@@ -170,6 +170,10 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
%exclude %{_pkgdocdir}/playbooks
%changelog
+* Tue Apr 15 2014 Miroslav Suchý <miroslav(a)suchy.cz> 1.33-1
+- do not publish copr.worker messages
+- better count workers
+
* Thu Apr 10 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.32-1
- include ec2rc in service unit file
diff --git a/rel-eng/packages/copr-backend b/rel-eng/packages/copr-backend
index 6ba1fbd..2f1e26d 100644
--- a/rel-eng/packages/copr-backend
+++ b/rel-eng/packages/copr-backend
@@ -1 +1 @@
-1.32-1 backend/
+1.33-1 backend/
10 years
[copr] master: do not publish copr.worker messages (bc85c1e)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit bc85c1ed872c42c388100f6654c9cd8e8ab5ed9b
Author: Miroslav Suchý <miroslav(a)suchy.cz>
Date: Tue Apr 15 01:04:46 2014 +0200
do not publish copr.worker messages
1) it is not really usefull
2) __init__() and run() is actually two different processes which cause fedmsg some problems
which I was unable to fix after several hours, so lets get rid of this
>---------------------------------------------------------------
backend/backend/dispatcher.py | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/backend/backend/dispatcher.py b/backend/backend/dispatcher.py
index 8b6fb0f..ca72f01 100644
--- a/backend/backend/dispatcher.py
+++ b/backend/backend/dispatcher.py
@@ -128,10 +128,8 @@ class Worker(multiprocessing.Process):
if ip:
self.callback.log("creating worker: {0}".format(ip))
- self.event("worker.create", "creating worker: {ip}", dict(ip=ip))
else:
self.callback.log("creating worker: dynamic ip")
- self.event("worker.create", "creating worker: dynamic ip")
def event(self, topic, template, content=None):
""" Multi-purpose logging method.
10 years
[copr] master: better count workers (76cbb95)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 76cbb95b6f1ed360cc3e4b5629ade812657ee245
Author: Miroslav Suchý <miroslav(a)suchy.cz>
Date: Mon Apr 14 22:30:15 2014 +0200
better count workers
if you start N workers and first one dies, then you another one is started as replacement,
but we label it as worker-N again.
>---------------------------------------------------------------
backend/copr-be.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/backend/copr-be.py b/backend/copr-be.py
index 8dea940..57fdcf8 100755
--- a/backend/copr-be.py
+++ b/backend/copr-be.py
@@ -196,6 +196,7 @@ class CoprBackend(object):
# create job grabber
self._jobgrab = CoprJobGrab(self.opts, self.events, self.jobs, self.lock)
self._jobgrab.start()
+ self.worker_num = 0
if not os.path.exists(self.opts.worker_logdir):
os.makedirs(self.opts.worker_logdir, mode=0750)
@@ -271,9 +272,9 @@ class CoprBackend(object):
if len(self.workers) < self.opts.num_workers:
self.event("Spinning up more workers for jobs")
for _ in range(self.opts.num_workers - len(self.workers)):
- worker_num = len(self.workers) + 1
+ self.worker_num += 1
w = Worker(
- self.opts, self.jobs, self.events, worker_num,
+ self.opts, self.jobs, self.events, self.worker_num,
lock=self.lock)
self.workers.append(w)
w.start()
10 years
[copr] master: check if chroot exist for specified project (e34c61b)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit e34c61bee4b40b465fa466ec8a30c20623c0e547
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 14 15:37:09 2014 +0200
check if chroot exist for specified project
addressing:
Exception on /api/coprs/hhorak/mysql55-test1/detail/fedora-20-x86_64/ [GET]
Traceback (most recent call last):
File "/usr/lib/python2.7/site-packages/flask/app.py", line 1687, in wsgi_app
response = self.full_dispatch_request()
File "/usr/lib/python2.7/site-packages/flask/app.py", line 1360, in full_dispatch_request
rv = self.handle_user_exception(e)
File "/usr/lib/python2.7/site-packages/flask/app.py", line 1358, in full_dispatch_request
rv = self.dispatch_request()
File "/usr/lib/python2.7/site-packages/flask/app.py", line 1344, in dispatch_request
return self.view_functions[rule.endpoint](**req.view_args)
File "/usr/share/copr/coprs_frontend/coprs/views/api_ns/api_general.py", line 414, in copr_chroot_details
output = {'output': 'ok', 'buildroot_pkgs': ch.buildroot_pkgs}
AttributeError: 'NoneType' object has no attribute 'buildroot_pkgs'
>---------------------------------------------------------------
.../coprs/views/api_ns/api_general.py | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py
index c5b43eb..b1acaee 100644
--- a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py
+++ b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py
@@ -411,8 +411,13 @@ def copr_chroot_details(username, coprname, chrootname):
httpcode = 500
else:
ch = copr.check_copr_chroot(chroot)
- output = {'output': 'ok', 'buildroot_pkgs': ch.buildroot_pkgs}
- httpcode = 200
+ if ch:
+ output = {'output': 'ok', 'buildroot_pkgs': ch.buildroot_pkgs}
+ httpcode = 200
+ else:
+ output = {"output": "notok", "error": "Invalid chroot for this project."}
+ httpcode = 404
+
jsonout = flask.jsonify(output)
jsonout.status_code = httpcode
10 years
[copr] master: better explain additional yum repos (d4ec0e1)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit d4ec0e18477bb41dca04265f08651be63c8e9529
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Apr 11 11:45:39 2014 +0200
better explain additional yum repos
>---------------------------------------------------------------
.../coprs/templates/coprs/_coprs_forms.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html b/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
index 6abe22f..a83cce4 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
@@ -44,7 +44,7 @@
{% endfor %}
</table>
{% endfor %}
- {{ render_field(form.repos, rows=5, cols=50, placeholder='Optional - URL to additional yum repos, which can be used during build. Space separated.') }}
+ {{ render_field(form.repos, rows=5, cols=50, placeholder='Optional - URL to additional yum repos, which can be used during build. Space separated. This should be baseurl from .repo file. E.g.: http://copr-be.cloud.fedoraproject.org/results/rhughes/f20-gnome-3-12/fed...') }}
{% if copr is none %}{# we're creating the copr, so display initial builds area #}
{{ render_field(form.initial_pkgs, rows=5, cols=50, placeholder='Optional - list of src.rpm to build initially. Can be skipped and submitted later.') }}
{% endif %}
10 years
[copr] master: stop building for el5 and start building for el7 (266860e)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 266860ef0faa092c5ebb6ef966131eee26d5c86d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Apr 11 10:27:34 2014 +0200
stop building for el5 and start building for el7
>---------------------------------------------------------------
rel-eng/releasers.conf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rel-eng/releasers.conf b/rel-eng/releasers.conf
index 92af343..7a1d165 100644
--- a/rel-eng/releasers.conf
+++ b/rel-eng/releasers.conf
@@ -8,7 +8,7 @@ branches = master
[fedora-git-all]
releaser = tito.release.FedoraGitReleaser
-branches = master f20 f19 el5 el6
+branches = master f20 f19 el6 el7
[copr-msuchy]
releaser = tito.release.CoprReleaser
10 years
[copr] master: Automatic commit of package [copr-frontend] release [1.32-1]. (a1830c5)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit a1830c5a91437c041327ca0ee1e5114437eb837b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 10 12:13:45 2014 +0200
Automatic commit of package [copr-frontend] release [1.32-1].
>---------------------------------------------------------------
frontend/copr-frontend.spec | 5 ++++-
rel-eng/packages/copr-frontend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/frontend/copr-frontend.spec b/frontend/copr-frontend.spec
index 7128de6..04977b3 100644
--- a/frontend/copr-frontend.spec
+++ b/frontend/copr-frontend.spec
@@ -5,7 +5,7 @@
%endif
Name: copr-frontend
-Version: 1.31
+Version: 1.32
Release: 1%{?dist}
Summary: Frontend for Copr
@@ -160,6 +160,9 @@ service httpd condrestart
%doc %{_pkgdocdir}/python-doc
%changelog
+* Thu Apr 10 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.32-1
+- send permissions request to admin not to requestee
+
* Wed Apr 09 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.31-1
- validate chroots in POST requests with API
- add /playground/list/ api call
diff --git a/rel-eng/packages/copr-frontend b/rel-eng/packages/copr-frontend
index dd1e884..57091a0 100644
--- a/rel-eng/packages/copr-frontend
+++ b/rel-eng/packages/copr-frontend
@@ -1 +1 @@
-1.31-1 frontend/
+1.32-1 frontend/
10 years
[copr] master: send permissions request to admin not to requestee (5bdd384)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 5bdd3848adb7b1a42f8eb2f596666e8e0e4710fc
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 10 12:13:23 2014 +0200
send permissions request to admin not to requestee
>---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_general.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 1d805ee..a2c80e4 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -296,9 +296,9 @@ def copr_permissions_applier_change(username, coprname):
copr.name, copr.owner.name, flask.g.user.name), "plain")
msg["Subject"] = "[Copr] {0}: {1} is asking permissons".format(copr.name, flask.g.user.name)
msg["From"] = "root@{0}".format(platform.node())
- msg["To"] = perm.user.mail
+ msg["To"] = mail
s = smtplib.SMTP("localhost")
- s.sendmail("root@{0}".format(platform.node()),perm.user.mail , msg.as_string())
+ s.sendmail("root@{0}".format(platform.node()), mail , msg.as_string())
s.quit()
10 years