[copr] frontend-python3: [frontend] use six.moves.urllib instead of py2 only urllib (5ad0dfc)
by frostyx＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : frontend-python3
>---------------------------------------------------------------
commit 5ad0dfca188fe37854f1e36b151e4abb044a87c1
Author: Jakub Kadlčík <jkadlcik(a)redhat.com>
Date: Mon Sep 21 16:25:28 2015 +0200
[frontend] use six.moves.urllib instead of py2 only urllib
>---------------------------------------------------------------
frontend/coprs_frontend/coprs/filters.py | 2 +-
frontend/coprs_frontend/coprs/forms.py | 8 ++++----
frontend/coprs_frontend/coprs/helpers.py | 4 ++--
.../coprs_frontend/coprs/logic/builds_logic.py | 1 -
.../coprs/views/api_ns/api_general.py | 1 -
.../coprs/views/coprs_ns/coprs_general.py | 4 ++--
.../coprs_frontend/run/generate_repo_packages.py | 4 ++--
7 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/filters.py b/frontend/coprs_frontend/coprs/filters.py
index cd0d87a..1bc8c80 100644
--- a/frontend/coprs_frontend/coprs/filters.py
+++ b/frontend/coprs_frontend/coprs/filters.py
@@ -1,5 +1,5 @@
import datetime
-from urlparse import urlparse
+from six.moves.urllib.parse import urlparse
import pytz
import time
import markdown
diff --git a/frontend/coprs_frontend/coprs/forms.py b/frontend/coprs_frontend/coprs/forms.py
index 7ffe436..9e9feda 100644
--- a/frontend/coprs_frontend/coprs/forms.py
+++ b/frontend/coprs_frontend/coprs/forms.py
@@ -1,5 +1,5 @@
import re
-import urlparse
+from six.moves.urllib.parse import urlparse
import flask
import wtforms
@@ -28,7 +28,7 @@ class UrlListValidator(object):
raise wtforms.ValidationError(self.message.format(u))
def is_url(self, url):
- parsed = urlparse.urlparse(url)
+ parsed = urlparse(url)
if not parsed.scheme.startswith("http"):
return False
if not parsed.netloc:
@@ -39,7 +39,7 @@ class UrlListValidator(object):
class UrlRepoListValidator(UrlListValidator):
""" Allows also `repo://` schema"""
def is_url(self, url):
- parsed = urlparse.urlparse(url)
+ parsed = urlparse(url)
if parsed.scheme not in ["http", "https", "copr"]:
return False
if not parsed.netloc:
@@ -63,7 +63,7 @@ class UrlSrpmListValidator(UrlListValidator):
super(UrlSrpmListValidator, self).__init__(message)
def is_url(self, url):
- parsed = urlparse.urlparse(url)
+ parsed = urlparse(url)
if not parsed.path.endswith((".src.rpm", ".nosrc.rpm")):
return False
return True
diff --git a/frontend/coprs_frontend/coprs/helpers.py b/frontend/coprs_frontend/coprs/helpers.py
index f3406b4..381fde8 100644
--- a/frontend/coprs_frontend/coprs/helpers.py
+++ b/frontend/coprs_frontend/coprs/helpers.py
@@ -1,9 +1,9 @@
import math
import random
import string
-import urlparse
import flask
+from six.moves.urllib.parse import urljoin
from dateutil import parser as dt_parser
from netaddr import IPAddress, IPNetwork
@@ -221,7 +221,7 @@ def generate_repo_url(mock_chroot, url):
if mock_chroot.os_version != "rawhide":
mock_chroot.os_version = "$releasever"
- url = urlparse.urljoin(
+ url = urljoin(
url, "{0}-{1}-{2}/".format(mock_chroot.os_release,
mock_chroot.os_version, "$basearch"))
diff --git a/frontend/coprs_frontend/coprs/logic/builds_logic.py b/frontend/coprs_frontend/coprs/logic/builds_logic.py
index 3082b5c..5b5a185 100644
--- a/frontend/coprs_frontend/coprs/logic/builds_logic.py
+++ b/frontend/coprs_frontend/coprs/logic/builds_logic.py
@@ -1,6 +1,5 @@
from collections import defaultdict
import tempfile
-import urlparse
import shutil
import json
import os
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 580c2bc..ee6e493 100644
--- a/frontend/coprs_frontend/coprs/views/api_ns/api_general.py
+++ b/frontend/coprs_frontend/coprs/views/api_ns/api_general.py
@@ -4,7 +4,6 @@ import os
import shutil
import tempfile
import json
-import urlparse
import flask
from werkzeug import secure_filename
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 7d90c0b..bf37527 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -2,7 +2,7 @@ import os
import time
import os
import re
-import urlparse
+from six.moves.urllib.parse import urljoin
import flask
from flask import render_template
@@ -641,7 +641,7 @@ def generate_repo_file(username, coprname, name_release, repofile):
# add trainling slash
url = os.path.join(url, '')
repo_url = generate_repo_url(mock_chroot, url)
- pubkey_url = urlparse.urljoin(url, "pubkey.gpg")
+ pubkey_url = urljoin(url, "pubkey.gpg")
response = flask.make_response(
flask.render_template("coprs/copr.repo", copr=copr, url=repo_url, pubkey_url=pubkey_url))
diff --git a/frontend/coprs_frontend/run/generate_repo_packages.py b/frontend/coprs_frontend/run/generate_repo_packages.py
index ab1289b..3a1b71e 100644
--- a/frontend/coprs_frontend/run/generate_repo_packages.py
+++ b/frontend/coprs_frontend/run/generate_repo_packages.py
@@ -12,10 +12,10 @@ from __future__ import division
from __future__ import absolute_import
import requests
-import urlparse
import os
import shutil
import subprocess
+from six.moves.urllib.parse import urljoin
here = os.path.dirname(os.path.realpath(__file__))
import sys
@@ -76,7 +76,7 @@ class RepoRpmBuilder(object):
def get_repofile(self):
api = "coprs/{}/{}/repo/{}".format(self.user, self.copr, self.chroot.name)
- url = urlparse.urljoin(FRONTEND_URL, api)
+ url = urljoin(FRONTEND_URL, api)
r = requests.get(url)
if r.status_code != 200:
raise RuntimeError("Can't get {}".format(url))
8 years, 7 months
[copr] master: Automatic commit of package [copr-frontend] release [1.69-1]. (8c164e0)
by vgologuz＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 8c164e078b2ecc32e6319c0433a39518ccd52910
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Tue Sep 22 22:07:32 2015 +0200
Automatic commit of package [copr-frontend] release [1.69-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 6669c8e..b896be0 100644
--- a/frontend/copr-frontend.spec
+++ b/frontend/copr-frontend.spec
@@ -5,7 +5,7 @@
%endif
Name: copr-frontend
-Version: 1.68
+Version: 1.69
Release: 1%{?dist}
Summary: Frontend for Copr
@@ -200,6 +200,9 @@ service logstash condrestart
#%doc documentation/python-doc
%changelog
+* Tue Sep 22 2015 Valentin Gologuzov <vgologuz(a)redhat.com> 1.69-1
+- hotfix for resubmit button
+
* Tue Sep 15 2015 Valentin Gologuzov <vgologuz(a)redhat.com> 1.68-1
- fix tests to create tmp directory for srpm upload
- don't depend on python-copr
diff --git a/rel-eng/packages/copr-frontend b/rel-eng/packages/copr-frontend
index 0e35442..345b98b 100644
--- a/rel-eng/packages/copr-frontend
+++ b/rel-eng/packages/copr-frontend
@@ -1 +1 @@
-1.68-1 frontend/
+1.69-1 frontend/
8 years, 7 months
[copr] master: [frontend] hotfix for resubmit button (7134cdd)
by vgologuz＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 7134cdd684a7a3fcd60a5b8f95d23ff198f658d9
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Tue Sep 22 22:01:47 2015 +0200
[frontend] hotfix for resubmit button
>---------------------------------------------------------------
dist-git/dist_git/dist_git_importer.py | 1 +
.../coprs_frontend/coprs/logic/builds_logic.py | 3 +++
.../coprs/views/backend_ns/backend_general.py | 1 +
3 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/dist-git/dist_git/dist_git_importer.py b/dist-git/dist_git/dist_git_importer.py
index b48fd69..ff52c1a 100755
--- a/dist-git/dist_git/dist_git_importer.py
+++ b/dist-git/dist_git/dist_git_importer.py
@@ -193,6 +193,7 @@ class DistGitImporter(object):
"""
Could raise error related to networkd connection
"""
+ log.debug("Sending back: \n{}".format(json.dumps(data_dict)))
return post(self.upload_url, auth=self.auth, data=json.dumps(data_dict), headers=self.headers)
def post_back_safe(self, data_dict):
diff --git a/frontend/coprs_frontend/coprs/logic/builds_logic.py b/frontend/coprs_frontend/coprs/logic/builds_logic.py
index 3082b5c..bb224c6 100644
--- a/frontend/coprs_frontend/coprs/logic/builds_logic.py
+++ b/frontend/coprs_frontend/coprs/logic/builds_logic.py
@@ -209,6 +209,9 @@ class BuildsLogic(object):
git_hashes=git_hashes,
skip_import=skip_import)
+ build.package_id = source_build.package_id
+ build.pkg_version = source_build.pkg_version
+
if user.proven:
if "timeout" in build_options:
build.timeout = build_options["timeout"]
diff --git a/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py b/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py
index 36f29b3..6d5b8ec 100644
--- a/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py
+++ b/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py
@@ -61,6 +61,7 @@ def dist_git_upload_completed():
result = {"updated": False}
if "task_id" in flask.request.json:
+ app.logger.debug(flask.request.data)
task_id = flask.request.json["task_id"]
build_chroots = BuildsLogic.get_chroots_from_dist_git_task_id(task_id)
build = build_chroots[0].build
8 years, 7 months
[copr] master: [frontend] added try/except to `/backend/waiting` handler (ef69d19)
by vgologuz＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit ef69d19a7194a14e1a7045808785cc4b04c4d5ab
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Tue Sep 22 13:29:29 2015 +0200
[frontend] added try/except to `/backend/waiting` handler
>---------------------------------------------------------------
.../coprs/views/backend_ns/backend_general.py | 58 +++++++++++---------
1 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py b/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py
index 64b30d7..36f29b3 100644
--- a/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py
+++ b/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py
@@ -3,7 +3,7 @@ import sys
import time
import os
-from coprs import db
+from coprs import db, app
from coprs import helpers
from coprs.helpers import StatusEnum
from coprs.logic import actions_logic
@@ -127,32 +127,36 @@ def waiting():
# tasks represented by models.BuildChroot with some other stuff
builds_list = []
for task in BuildsLogic.get_build_task_queue().limit(200):
- record = {
- "task_id": "{}-{}".format(task.build.id, task.mock_chroot.name),
- "build_id": task.build.id,
- "project_owner": task.build.copr.owner.name,
- "project_name": task.build.copr.name,
- "submitter": task.build.user.name,
- "pkgs": task.build.pkgs, # TODO to be removed
- "chroot": task.mock_chroot.name,
-
- "repos": task.build.repos,
- "memory_reqs": task.build.memory_reqs,
- "timeout": task.build.timeout,
- "enable_net": task.build.enable_net,
- "git_repo": task.build.package.dist_git_repo,
- "git_hash": task.git_hash,
- "git_branch": helpers.chroot_to_branch(task.mock_chroot.name),
- "package_name": task.build.package.name,
- "package_version": task.build.pkg_version
- }
- copr_chroot = CoprChrootsLogic.get_by_name_safe(task.build.copr, task.mock_chroot.name)
- if copr_chroot:
- record["buildroot_pkgs"] = copr_chroot.buildroot_pkgs
- else:
- record["buildroot_pkgs"] = ""
+ try:
+ record = {
+ "task_id": "{}-{}".format(task.build.id, task.mock_chroot.name),
+ "build_id": task.build.id,
+ "project_owner": task.build.copr.owner.name,
+ "project_name": task.build.copr.name,
+ "submitter": task.build.user.name,
+ "pkgs": task.build.pkgs, # TODO to be removed
+ "chroot": task.mock_chroot.name,
+
+ "repos": task.build.repos,
+ "memory_reqs": task.build.memory_reqs,
+ "timeout": task.build.timeout,
+ "enable_net": task.build.enable_net,
+ "git_repo": task.build.package.dist_git_repo,
+ "git_hash": task.git_hash,
+ "git_branch": helpers.chroot_to_branch(task.mock_chroot.name),
+ "package_name": task.build.package.name,
+ "package_version": task.build.pkg_version
+ }
+ copr_chroot = CoprChrootsLogic.get_by_name_safe(task.build.copr, task.mock_chroot.name)
+ if copr_chroot:
+ record["buildroot_pkgs"] = copr_chroot.buildroot_pkgs
+ else:
+ record["buildroot_pkgs"] = ""
+
+ builds_list.append(record)
- builds_list.append(record)
+ except Exception as err:
+ app.logger.exception(err)
response_dict = {"actions": actions_list, "builds": builds_list}
return flask.jsonify(response_dict)
8 years, 7 months
[copr] master: Automatic commit of package [copr-backend] release [1.75-1]. (2179b3f)
by vgologuz＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 2179b3f524d9de80b65612b3245e97c4c5eb2c99
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Mon Sep 21 16:51:17 2015 +0200
Automatic commit of package [copr-backend] release [1.75-1].
>---------------------------------------------------------------
backend/copr-backend.spec | 5 ++++-
rel-eng/packages/copr-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec
index 35d5a62..1f3e1ae 100644
--- a/backend/copr-backend.spec
+++ b/backend/copr-backend.spec
@@ -3,7 +3,7 @@
%endif
Name: copr-backend
-Version: 1.74
+Version: 1.75
Release: 1%{?dist}
Summary: Backend for Copr
@@ -244,6 +244,9 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
%exclude %{_pkgdocdir}/playbooks
%changelog
+* Mon Sep 21 2015 Valentin Gologuzov <vgologuz(a)redhat.com> 1.75-1
+- [backend] run copr-backend-log service before other components
+
* Mon Sep 21 2015 Valentin Gologuzov <vgologuz(a)redhat.com> 1.74-1
- [backend] add executible bit to run/copr_run_job_grab.py
diff --git a/rel-eng/packages/copr-backend b/rel-eng/packages/copr-backend
index dc185d1..b1411c2 100644
--- a/rel-eng/packages/copr-backend
+++ b/rel-eng/packages/copr-backend
@@ -1 +1 @@
-1.74-1 backend/
+1.75-1 backend/
8 years, 7 months
[copr] master: [backend] run copr-backend-log service before other components (97c7b70)
by vgologuz＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 97c7b70c1b890334adeea706cc854867ea7a362b
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Mon Sep 21 16:48:56 2015 +0200
[backend] run copr-backend-log service before other components
>---------------------------------------------------------------
backend/run/systemd/copr-backend-log.service | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/backend/run/systemd/copr-backend-log.service b/backend/run/systemd/copr-backend-log.service
index 1577743..b81088c 100644
--- a/backend/run/systemd/copr-backend-log.service
+++ b/backend/run/systemd/copr-backend-log.service
@@ -1,7 +1,7 @@
[Unit]
Description=Copr Backend service, Log Handler component
After=syslog.target network.target auditd.service
-Before=copr-backend.service
+Before=copr-backend.service copr-backend-vmm.service copr-backend-jobgrab.service
[Service]
Type=simple
8 years, 7 months