[copr] master: Automatic commit of package [prunerepo] release [1.2-1]. (6305ab3)
by clime@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 6305ab3d34e29bfaea40232bee846f52c115c84b
Author: clime <clime(a)redhat.com>
Date: Tue Jan 26 13:40:11 2016 +0100
Automatic commit of package [prunerepo] release [1.2-1].
>---------------------------------------------------------------
.tito/packages/prunerepo | 2 +-
prunerepo/prunerepo.spec | 11 ++++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/.tito/packages/prunerepo b/.tito/packages/prunerepo
index 120c45b..374360d 100644
--- a/.tito/packages/prunerepo
+++ b/.tito/packages/prunerepo
@@ -1 +1 @@
-1.1-1 prunerepo/
+1.2-1 prunerepo/
diff --git a/prunerepo/prunerepo.spec b/prunerepo/prunerepo.spec
index 4d08cac..9d4977b 100644
--- a/prunerepo/prunerepo.spec
+++ b/prunerepo/prunerepo.spec
@@ -1,6 +1,6 @@
Summary: Remove old packages from rpm-md repository
Name: prunerepo
-Version: 1.1
+Version: 1.2
Release: 1%{?dist}
# Source is created by:
@@ -51,8 +51,13 @@ install -p -m 644 man/prunerepo.1 %{buildroot}/%{_mandir}/man1/
%{_mandir}/man1/prunerepo.1*
%changelog
+* Tue Jan 26 2016 clime <clime(a)redhat.com> 1.2-1
+- bugfix for --cleancopr when a log for the respective dir does not
+ exist (e.g. copr repos with old dir naming)
+
* Mon Jan 25 2016 clime <clime(a)redhat.com> 1.1-1
-- test suite finished (clime(a)redhat.com)
-- --quiet, --cleancopr and --days options implemented (clime(a)redhat.com)
+- test suite finished
+- --quiet, --cleancopr and --days options implemented
+
* Tue Jan 19 2016 clime <clime(a)redhat.com> 1.0-1
- Initial package version
8 years, 3 months
[copr] master: [frontend] fix 1300849 - Deleting any Git based build leads to 'NoneType' object has no attribute 'split' - The logic above the incriminated function is tricky. Basically, when import into dist-git fails, a build has no git hash set in frontend db. Consequently, it is considered to be a build with old-naming scheme (that came together with dist-git and hence introduction of git hashes) during delete operation when the name of remote builddir is being worked out. The old-naming scheme code pat
by clime@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 0937682b3fff08dd36e280af477160f635116827
Author: clime <clime(a)redhat.com>
Date: Tue Jan 26 12:28:10 2016 +0100
[frontend] fix 1300849 - Deleting any Git based build leads to 'NoneType' object has no attribute 'split' - The logic above the incriminated function is tricky. Basically, when import into dist-git fails, a build has no git hash set in frontend db. Consequently, it is considered to be a build with old-naming scheme (that came together with dist-git and hence introduction of git hashes) during delete operation when the name of remote builddir is being worked out. The old-naming scheme code path assumed existing souce package (uploaded or got through url) but this is not the case for git/scm tools, hence the error. Now, after the fix, no exception is raised and no action is sent to backend so only records in fe-db are deleted as a part of the delete operation. The code path is weird but the behavior is ok.
>---------------------------------------------------------------
frontend/coprs_frontend/coprs/models.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/models.py b/frontend/coprs_frontend/coprs/models.py
index 281bb8a..e030458 100644
--- a/frontend/coprs_frontend/coprs/models.py
+++ b/frontend/coprs_frontend/coprs/models.py
@@ -637,7 +637,10 @@ class Build(db.Model, helpers.Serializer):
Extract source package name from source name or url
todo: obsolete
"""
- src_rpm_name = self.pkgs.split("/")[-1]
+ try:
+ src_rpm_name = self.pkgs.split("/")[-1]
+ except:
+ return None
if src_rpm_name.endswith(".src.rpm"):
return src_rpm_name[:-8]
else:
8 years, 3 months
[copr] master: [backend] jobgrabcontrol.py/retask misuse fix (ab144a6)
by Pavel Raiskup
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit ab144a6388bca952d247d20fdef89fecf0b6f845
Author: Pavel Raiskup <praiskup(a)redhat.com>
Date: Tue Jan 26 11:40:01 2016 +0100
[backend] jobgrabcontrol.py/retask misuse fix
This complements 59c6e38005456d22f079c3dd5 commit.
>---------------------------------------------------------------
backend/backend/jobgrabcontrol.py | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/backend/backend/jobgrabcontrol.py b/backend/backend/jobgrabcontrol.py
index c8d7414..4ff2ca9 100644
--- a/backend/backend/jobgrabcontrol.py
+++ b/backend/backend/jobgrabcontrol.py
@@ -19,7 +19,7 @@ class Channel(object):
# channel for JobGrabber <--> [[Builders]] communication
self.build_queues = dict()
while not self.jg_start.connect():
- wait_log("waiting for redis", 5)
+ wait_log(self.log, "waiting for redis", 5)
def _get_queue(self, bgroup):
if not bgroup in self.build_queues:
@@ -75,6 +75,8 @@ class Channel(object):
# Backend's API
def backend_start(self):
""" Notify jobgrab about service start. """
- self.jg_start.enqueue("start")
+ if not self.jg_start.enqueue(Task("start")):
+ raise Exception("can't append to retask queue, should never happen!")
+
while self.jg_start.length:
wait_log(self.log, "waiting until jobgrabber initializes queue")
8 years, 3 months
[copr] master: [frontend] fix 1299159 - "Git & Tito" new build includes even deselected chroots (cec8a8c)
by clime@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit cec8a8c0e328bfe7be7b493f98b75b175372958e
Author: clime <clime(a)redhat.com>
Date: Tue Jan 26 10:43:21 2016 +0100
[frontend] fix 1299159 - "Git & Tito" new build includes even deselected chroots
>---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_builds.py | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
index ae4bbe0..3b6ed1f 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
@@ -162,7 +162,13 @@ def process_new_build_tito(copr, add_view, url_on_success):
try:
BuildsLogic.create_new_from_tito(
- flask.g.user, copr, form.git_url.data, form.git_directory.data, form.git_branch.data, form.tito_test.data,
+ flask.g.user,
+ copr,
+ form.git_url.data,
+ form.git_directory.data,
+ form.git_branch.data,
+ form.tito_test.data,
+ form.selected_chroots,
**build_options
)
db.session.commit()
@@ -251,7 +257,13 @@ def process_new_build_mock(copr, add_view, url_on_success):
try:
BuildsLogic.create_new_from_mock(
- flask.g.user, copr, form.scm_type.data, form.scm_url.data, form.scm_branch.data, form.spec.data,
+ flask.g.user,
+ copr,
+ form.scm_type.data,
+ form.scm_url.data,
+ form.scm_branch.data,
+ form.spec.data,
+ form.selected_chroots,
**build_options
)
db.session.commit()
8 years, 3 months
[copr] master: [frontend] remove trailing and leading whitespaces in links (at least for build links, other links might still contain some) (13cd5e7)
by clime@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 13cd5e7bc32dad80e27f1e607cf64cbc9c51e6d2
Author: clime <clime(a)redhat.com>
Date: Mon Jan 25 17:19:31 2016 +0100
[frontend] remove trailing and leading whitespaces in links (at least for build links, other links might still contain some)
>---------------------------------------------------------------
frontend/coprs_frontend/coprs/__init__.py | 3 +++
.../coprs_frontend/coprs/templates/_helpers.html | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/__init__.py b/frontend/coprs_frontend/coprs/__init__.py
index c3e5f4d..81459b3 100644
--- a/frontend/coprs_frontend/coprs/__init__.py
+++ b/frontend/coprs_frontend/coprs/__init__.py
@@ -86,6 +86,9 @@ app.register_blueprint(webhooks_ns)
app.add_url_rule("/", "coprs_ns.coprs_show", coprs_general.coprs_show)
+app.jinja_env.trim_blocks = True
+app.jinja_env.lstrip_blocks = True
+
from coprs.rest_api import rest_api_bp, register_api_error_handler, URL_PREFIX
register_api_error_handler(app)
app.register_blueprint(rest_api_bp, url_prefix=URL_PREFIX)
diff --git a/frontend/coprs_frontend/coprs/templates/_helpers.html b/frontend/coprs_frontend/coprs/templates/_helpers.html
index 2134b3d..6102dc8 100644
--- a/frontend/coprs_frontend/coprs/templates/_helpers.html
+++ b/frontend/coprs_frontend/coprs/templates/_helpers.html
@@ -310,14 +310,14 @@
{% macro build_href(build) %}
- {{ copr_url("coprs_ns.copr_build", build.copr, build_id=build.id) }}
+ {{- copr_url("coprs_ns.copr_build", build.copr, build_id=build.id) -}}
{% endmacro %}
{% macro build_href_from_sql(build) %}
{% if build.group_name %}
- {{ url_for('coprs_ns.group_copr_build', group_name=build.group_name, coprname=build.copr_name, build_id=build.id) }}
+ {{- url_for('coprs_ns.group_copr_build', group_name=build.group_name, coprname=build.copr_name, build_id=build.id) -}}
{% else %}
- {{ url_for("coprs_ns.copr_build", username = build.owner_name, coprname = build.copr_name, build_id = build.id) }}
+ {{- url_for("coprs_ns.copr_build", username = build.owner_name, coprname = build.copr_name, build_id = build.id) -}}
{% endif %}
{% endmacro %}
8 years, 3 months
[copr] master: [dist-git] error handling based on subprocess return codes instead of output to stderr (e.g. git outputs progress to stderr) + missing catch for GitException in do_import (results in better error messages in frontend, see bz#1295540) (4e2245f)
by clime@fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 4e2245f5542b57ea02257e802d1666e3b5285172
Author: clime <clime(a)redhat.com>
Date: Mon Jan 25 15:35:04 2016 +0100
[dist-git] error handling based on subprocess return codes instead of output to stderr (e.g. git outputs progress to stderr) + missing catch for GitException in do_import (results in better error messages in frontend, see bz#1295540)
>---------------------------------------------------------------
dist-git/dist_git/dist_git_importer.py | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/dist-git/dist_git/dist_git_importer.py b/dist-git/dist_git/dist_git_importer.py
index 2734b36..071a73f 100755
--- a/dist-git/dist_git/dist_git_importer.py
+++ b/dist-git/dist_git/dist_git_importer.py
@@ -201,8 +201,10 @@ class GitProvider(SrpmBuilderProvider):
proc = Popen(cmd, stdout=PIPE, stderr=PIPE, cwd=self.tmp)
output, error = proc.communicate()
except OSError as e:
+ log.error(str(e))
raise GitException(FailTypeEnum("git_clone_failed"))
- if error:
+ if proc.returncode != 0:
+ log.error(error)
raise GitException(FailTypeEnum("git_clone_failed"))
# 1b. get dir name
@@ -212,8 +214,10 @@ class GitProvider(SrpmBuilderProvider):
proc = Popen(cmd, stdout=PIPE, stderr=PIPE, cwd=self.tmp)
output, error = proc.communicate()
except OSError as e:
+ log.error(str(e))
raise GitException(FailTypeEnum("git_wrong_directory"))
- if error:
+ if proc.returncode != 0:
+ log.error(error)
raise GitException(FailTypeEnum("git_wrong_directory"))
if output and len(output.split()) == 1:
git_dir_name = output.split()[0]
@@ -232,8 +236,10 @@ class GitProvider(SrpmBuilderProvider):
proc = Popen(cmd, stdout=PIPE, stderr=PIPE, cwd=self.git_dir)
output, error = proc.communicate()
except OSError as e:
+ log.error(str(e))
raise GitException(FailTypeEnum("git_checkout_error"))
- if proc.returncode:
+ if proc.returncode != 0:
+ log.error(error)
raise GitException(FailTypeEnum("git_checkout_error"))
def build(self):
@@ -263,8 +269,10 @@ class GitAndTitoProvider(GitProvider):
proc = Popen(cmd, stdout=PIPE, stderr=PIPE, cwd=git_subdir)
output, error = proc.communicate()
except OSError as e:
+ log.error(str(e))
raise GitAndTitoException(FailTypeEnum("srpm_build_error"))
- if error:
+ if proc.returncode != 0:
+ log.error(error)
raise GitAndTitoException(FailTypeEnum("srpm_build_error"))
@@ -290,9 +298,9 @@ class MockScmProvider(SrpmBuilderProvider):
proc = Popen(" ".join(cmd), shell=True, stdout=PIPE, stderr=PIPE)
output, error = proc.communicate()
except OSError as e:
- log.error(error)
+ log.error(str(e))
raise SrpmBuilderException(FailTypeEnum("srpm_build_error"))
- if proc.returncode:
+ if proc.returncode != 0:
log.error(error)
raise SrpmBuilderException(FailTypeEnum("srpm_build_error"))
@@ -387,8 +395,10 @@ class DistGitImporter(object):
proc = Popen(cmd, stdout=PIPE, stderr=PIPE)
output, error = proc.communicate()
except OSError as e:
+ log.error(str(e))
raise PackageQueryException(e)
- if error:
+ if proc.returncode != 0:
+ log.error(error)
raise PackageQueryException('Error querying srpm: %s' % error)
try:
@@ -462,6 +472,11 @@ class DistGitImporter(object):
log.exception("send a response - failure during query of: {}".format(task.package_url))
self.post_back_safe({"task_id": task.task_id, "error": "srpm_query_failed"})
+ except GitException as e:
+ log.exception("send a response - failure during query of: {}".format(task.package_url))
+ log.exception("... due to: {}".format(str(e)))
+ self.post_back_safe({"task_id": task.task_id, "error": str(e)})
+
except GitAndTitoException as e:
log.exception("send a response - failure during 'Tito and Git' import of: {}".format(task.git_url))
log.exception(" ... due to: {}".format(str(e)))
8 years, 3 months
[copr] master: move ./rel-eng/ to ./tito/ (2fc8df3)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 2fc8df33d5764f1c47ddffe39446d290d437fa74
Author: Miroslav Such�� <msuchy(a)redhat.com>
Date: Mon Jan 25 14:51:06 2016 +0100
move ./rel-eng/ to ./tito/
>---------------------------------------------------------------
{rel-eng => .tito}/git-untagged-commits.pl | 0
{rel-eng => .tito}/packages/copr-backend | 0
{rel-eng => .tito}/packages/copr-cli | 0
{rel-eng => .tito}/packages/copr-frontend | 0
{rel-eng => .tito}/packages/copr-keygen | 0
{rel-eng => .tito}/packages/copr-selinux | 0
{rel-eng => .tito}/packages/python-copr | 0
{rel-eng => .tito}/releasers.conf | 0
.tito/tito.props | 2 +-
rel-eng/packages/.readme | 3 ---
rel-eng/packages/copr-dist-git | 1 -
rel-eng/packages/copr-prune-repo | 1 -
rel-eng/tito.props | 5 -----
13 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/rel-eng/git-untagged-commits.pl b/.tito/git-untagged-commits.pl
similarity index 100%
rename from rel-eng/git-untagged-commits.pl
rename to .tito/git-untagged-commits.pl
diff --git a/rel-eng/packages/copr-backend b/.tito/packages/copr-backend
similarity index 100%
rename from rel-eng/packages/copr-backend
rename to .tito/packages/copr-backend
diff --git a/rel-eng/packages/copr-cli b/.tito/packages/copr-cli
similarity index 100%
rename from rel-eng/packages/copr-cli
rename to .tito/packages/copr-cli
diff --git a/rel-eng/packages/copr-frontend b/.tito/packages/copr-frontend
similarity index 100%
rename from rel-eng/packages/copr-frontend
rename to .tito/packages/copr-frontend
diff --git a/rel-eng/packages/copr-keygen b/.tito/packages/copr-keygen
similarity index 100%
rename from rel-eng/packages/copr-keygen
rename to .tito/packages/copr-keygen
diff --git a/rel-eng/packages/copr-selinux b/.tito/packages/copr-selinux
similarity index 100%
rename from rel-eng/packages/copr-selinux
rename to .tito/packages/copr-selinux
diff --git a/rel-eng/packages/python-copr b/.tito/packages/python-copr
similarity index 100%
rename from rel-eng/packages/python-copr
rename to .tito/packages/python-copr
diff --git a/rel-eng/releasers.conf b/.tito/releasers.conf
similarity index 100%
rename from rel-eng/releasers.conf
rename to .tito/releasers.conf
diff --git a/.tito/tito.props b/.tito/tito.props
index eab3f19..1120d24 100644
--- a/.tito/tito.props
+++ b/.tito/tito.props
@@ -2,4 +2,4 @@
builder = tito.builder.Builder
tagger = tito.tagger.VersionTagger
changelog_do_not_remove_cherrypick = 0
-changelog_format = %s (%ae)
+changelog_format = %s
diff --git a/rel-eng/packages/.readme b/rel-eng/packages/.readme
deleted file mode 100644
index 8999c8d..0000000
--- a/rel-eng/packages/.readme
+++ /dev/null
@@ -1,3 +0,0 @@
-the rel-eng/packages directory contains metadata files
-named after their packages. Each file has the latest tagged
-version and the project's relative directory.
diff --git a/rel-eng/packages/copr-dist-git b/rel-eng/packages/copr-dist-git
deleted file mode 100644
index f3dd6ef..0000000
--- a/rel-eng/packages/copr-dist-git
+++ /dev/null
@@ -1 +0,0 @@
-0.10-1 dist-git/
diff --git a/rel-eng/packages/copr-prune-repo b/rel-eng/packages/copr-prune-repo
deleted file mode 100644
index 894d6ed..0000000
--- a/rel-eng/packages/copr-prune-repo
+++ /dev/null
@@ -1 +0,0 @@
-1.4-1 copr-prune-repo/
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
deleted file mode 100644
index 1120d24..0000000
--- a/rel-eng/tito.props
+++ /dev/null
@@ -1,5 +0,0 @@
-[buildconfig]
-builder = tito.builder.Builder
-tagger = tito.tagger.VersionTagger
-changelog_do_not_remove_cherrypick = 0
-changelog_format = %s
8 years, 3 months
[copr] master: Automatic commit of package [copr-dist-git] release [0.12-1]. (857d911)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 857d9110d0b31aa307aae63fb5b7e4cdb6b5823c
Author: Miroslav Such�� <msuchy(a)redhat.com>
Date: Mon Jan 25 14:43:33 2016 +0100
Automatic commit of package [copr-dist-git] release [0.12-1].
>---------------------------------------------------------------
.tito/packages/copr-dist-git | 2 +-
dist-git/copr-dist-git.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.tito/packages/copr-dist-git b/.tito/packages/copr-dist-git
index 8d0dda7..db18dd6 100644
--- a/.tito/packages/copr-dist-git
+++ b/.tito/packages/copr-dist-git
@@ -1 +1 @@
-0.11-1 dist-git/
+0.12-1 dist-git/
diff --git a/dist-git/copr-dist-git.spec b/dist-git/copr-dist-git.spec
index ebe9c19..d0959cc 100644
--- a/dist-git/copr-dist-git.spec
+++ b/dist-git/copr-dist-git.spec
@@ -1,5 +1,5 @@
Name: copr-dist-git
-Version: 0.11
+Version: 0.12
Release: 1%{?dist}
Summary: Copr services for Dist Git server
@@ -101,6 +101,9 @@ restorecon -rv /var/lib/copr-dist-git
%ghost %{_var}/log/copr-dist-git/*.log
%changelog
+* Mon Jan 25 2016 Miroslav Such�� <msuchy(a)redhat.com> 0.12-1
+- pass --scm-option spec=foo to mock-scm (msuchy(a)redhat.com)
+
* Thu Jan 21 2016 clime <clime(a)redhat.com> 0.11-1
- tito added to requirements
8 years, 3 months
[copr] master: remove old releasers (b1687a1)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit b1687a13d191c828d0915de5866f83c6bd94caf4
Author: Miroslav Such�� <msuchy(a)redhat.com>
Date: Mon Jan 25 14:43:23 2016 +0100
remove old releasers
>---------------------------------------------------------------
rel-eng/releasers.conf | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/rel-eng/releasers.conf b/rel-eng/releasers.conf
index 7fb942f..d9f7a1b 100644
--- a/rel-eng/releasers.conf
+++ b/rel-eng/releasers.conf
@@ -14,10 +14,6 @@ branches = f23
releaser = tito.release.FedoraGitReleaser
branches = master f23 f22 f21 el6 epel7
-[copr-msuchy]
-releaser = tito.release.CoprReleaser
-project_name = copr
-
[copr-msuchy-test]
releaser = tito.release.CoprReleaser
project_name = copr-dev
@@ -31,10 +27,3 @@ project_name = @copr/copr
releaser = tito.release.CoprReleaser
project_name = @copr/copr-dev
builder.test = 1
-
-[copr-vgologuz]
-releaser = tito.release.CoprReleaser
-project_name = msuchy/copr
-upload_command = scp %(srpm)s people.redhat.com:public_html/copr-rel/
-remote_location = http://people.redhat.com/~vgologuz/copr-rel/
-
8 years, 3 months