[copr] new: [frontend] fix BuildsLogic.new not assigning copr to build (1ebc1f0)
by Richard Marko
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : new
>---------------------------------------------------------------
commit 1ebc1f0ea210093867b405e2c85f0b8b7235c58d
Author: Richard Marko <rmarko(a)fedoraproject.org>
Date: Tue Jan 21 14:25:36 2014 +0100
[frontend] fix BuildsLogic.new not assigning copr to build
Clap clap.
Signed-off-by: Richard Marko <rmarko(a)fedoraproject.org>
>---------------------------------------------------------------
coprs_frontend/coprs/logic/builds_logic.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/coprs_frontend/coprs/logic/builds_logic.py b/coprs_frontend/coprs/logic/builds_logic.py
index 05ce536..682d7ce 100644
--- a/coprs_frontend/coprs/logic/builds_logic.py
+++ b/coprs_frontend/coprs/logic/builds_logic.py
@@ -78,6 +78,8 @@ class BuildsLogic(object):
build.submitted_on = int(time.time())
if not build.user:
build.user = user
+ if not build.copr:
+ build.copr = copr
db.session.add(build)
10 years, 5 months
[copr] new: [frontend] 1050904 - monitor shows not submitted chroots (e5a851c)
by Richard Marko
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : new
>---------------------------------------------------------------
commit e5a851ca51aab646a38dd395a22aea7f4b5269de
Author: Richard Marko <rmarko(a)fedoraproject.org>
Date: Tue Jan 21 13:01:45 2014 +0100
[frontend] 1050904 - monitor shows not submitted chroots
Signed-off-by: Richard Marko <rmarko(a)fedoraproject.org>
>---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_general.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 1973ae5..c103401 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -375,12 +375,14 @@ def copr_build_monitor(username, coprname):
out = {}
build = None
- chroots = []
+ chroots = set([chroot.name for chroot in copr.active_chroots])
latest_build = None
if builds:
latest_build = builds[0]
- chroots = sorted([chroot.name for chroot in latest_build.build_chroots])
+ chroots.union([chroot.name for chroot in latest_build.build_chroots])
+
+ chroots = sorted(chroots)
for build in builds:
chroot_results = {chroot.name: chroot.state
@@ -391,7 +393,7 @@ def copr_build_monitor(username, coprname):
if chroot_name in chroot_results:
build_results.append(chroot_results[chroot_name])
else:
- build_results.append('')
+ build_results.append('not submitted yet')
for pkg_url in build.pkgs.split():
pkg = os.path.basename(pkg_url)
10 years, 5 months
[copr] new: [frontend] allow GET on repeat_build (5c2aafb)
by Richard Marko
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : new
>---------------------------------------------------------------
commit 5c2aafbb019b101a482fa667433cf836f7310659
Author: Richard Marko <rmarko(a)fedoraproject.org>
Date: Tue Jan 21 13:45:08 2014 +0100
[frontend] allow GET on repeat_build
Drops TODO message, intersection of active chroots
is not what we want as we want to repeat build
with all active chroots currently assigned to this copr.
Signed-off-by: Richard Marko <rmarko(a)fedoraproject.org>
>---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_builds.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
index d0e0763..c451f48 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
@@ -87,7 +87,7 @@ def copr_cancel_build(username, coprname, build_id):
return flask.redirect(flask.url_for('coprs_ns.copr_builds', username = username, coprname = coprname))
-(a)coprs_ns.route('/<username>/<coprname>/repeat_build/<int:build_id>/', methods = ['POST'])
+(a)coprs_ns.route('/<username>/<coprname>/repeat_build/<int:build_id>/', methods = ['GET', 'POST'])
@login_required
def copr_repeat_build(username, coprname, build_id):
build = builds_logic.BuildsLogic.get(build_id).first()
@@ -99,7 +99,6 @@ def copr_repeat_build(username, coprname, build_id):
if not copr:
return page_not_found('Copr {0}/{1} does not exist.'.format(username, coprname))
- # TODO: do intersection of chroots with currently active?
new_build = models.Build()
for a in ['pkgs', 'repos', 'memory_reqs', 'timeout']:
setattr(new_build, a, getattr(build, a))
10 years, 5 months
[copr] new: [tests] fix https and repo generation (b55f693)
by Richard Marko
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : new
>---------------------------------------------------------------
commit b55f693ffcdda781786e2216809b0dcf86aeac9f
Author: Richard Marko <rmarko(a)fedoraproject.org>
Date: Mon Jan 20 16:43:13 2014 +0100
[tests] fix https and repo generation
Signed-off-by: Richard Marko <rmarko(a)fedoraproject.org>
>---------------------------------------------------------------
.../test_views/test_coprs_ns/test_coprs_general.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py b/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
index 1e3c0a8..c539d1e 100644
--- a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
+++ b/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
@@ -386,9 +386,9 @@ class TestCoprRepoGeneration(CoprsTestCase):
@pytest.fixture
def f_custom_builds(self):
''' Custom builds are used in order not to break the default ones '''
- self.b5 = self.models.Build(copr=self.c1, user=self.u1, submitted_on=9, ended_on=200, results='http://bar.baz')
+ self.b5 = self.models.Build(copr=self.c1, user=self.u1, submitted_on=9, ended_on=200, results='https://bar.baz')
self.b6 = self.models.Build(copr=self.c1, user=self.u1, submitted_on=11)
- self.b7 = self.models.Build(copr=self.c1, user=self.u1, submitted_on=10, ended_on=150, results='http://bar.baz')
+ self.b7 = self.models.Build(copr=self.c1, user=self.u1, submitted_on=10, ended_on=150, results='https://bar.baz')
self.mc1 = self.models.MockChroot(os_release='fedora', os_version='18', arch='x86_64')
self.cc1 = self.models.CoprChroot(mock_chroot = self.mc1, copr = self.c1)
10 years, 5 months
[copr] new: 1054472 - Fix deleting multiple SRPMs (86464dc)
by Richard Marko
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : new
>---------------------------------------------------------------
commit 86464dc008de28f3c268a048fbc99346b5eabae9
Author: Richard Marko <rmarko(a)fedoraproject.org>
Date: Mon Jan 20 16:23:12 2014 +0100
1054472 - Fix deleting multiple SRPMs
Adds Action.data column and fills it with SRPM list rather than
mis-using 255 long new_value column.
Signed-off-by: Richard Marko <rmarko(a)fedoraproject.org>
>---------------------------------------------------------------
backend/actions.py | 2 +-
.../versions/294405dfc7c0_add_action_data_fiel.py | 24 ++++++++++++++++++++
coprs_frontend/coprs/logic/builds_logic.py | 2 +-
coprs_frontend/coprs/models.py | 2 +
.../test_views/test_coprs_ns/test_coprs_builds.py | 2 +-
5 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/backend/actions.py b/backend/actions.py
index 11451cc..2568459 100644
--- a/backend/actions.py
+++ b/backend/actions.py
@@ -38,7 +38,7 @@ class Action(object):
project = self.data['old_value']
packages = map(lambda x:
os.path.basename(x).replace('.src.rpm', ''),
- self.data['new_value'].split())
+ self.data['data'].split())
path = os.path.join(self.destdir, project)
diff --git a/coprs_frontend/alembic/versions/294405dfc7c0_add_action_data_fiel.py b/coprs_frontend/alembic/versions/294405dfc7c0_add_action_data_fiel.py
new file mode 100644
index 0000000..6463cf5
--- /dev/null
+++ b/coprs_frontend/alembic/versions/294405dfc7c0_add_action_data_fiel.py
@@ -0,0 +1,24 @@
+"""add Action.data field
+
+Revision ID: 294405dfc7c0
+Revises: 3a415c6392bc
+Create Date: 2014-01-20 15:43:09.986912
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '294405dfc7c0'
+down_revision = '3a415c6392bc'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+ """ Add 'data' colum to action table. """
+ op.add_column('action', sa.Column('data', sa.Text()))
+
+
+def downgrade():
+ """ Drop 'data' colum from action table. """
+ op.drop_column('action', 'data')
diff --git a/coprs_frontend/coprs/logic/builds_logic.py b/coprs_frontend/coprs/logic/builds_logic.py
index 4881ab6..7721b30 100644
--- a/coprs_frontend/coprs/logic/builds_logic.py
+++ b/coprs_frontend/coprs/logic/builds_logic.py
@@ -138,7 +138,7 @@ class BuildsLogic(object):
object_id=build.id,
old_value='{0}/{1}'.format(build.copr.owner.name,
build.copr.name),
- new_value=build.pkgs,
+ data=build.pkgs,
created_on=int(time.time()))
db.session.add(action)
diff --git a/coprs_frontend/coprs/models.py b/coprs_frontend/coprs/models.py
index 4352661..527461b 100644
--- a/coprs_frontend/coprs/models.py
+++ b/coprs_frontend/coprs/models.py
@@ -379,6 +379,8 @@ class Action(db.Model, Serializer):
# old and new values of the changed property
old_value = db.Column(db.String(255))
new_value = db.Column(db.String(255))
+ # additional data
+ data = db.Column(db.Text)
# result of the action, see helpers.BackendResultEnum
result = db.Column(db.Integer, default=helpers.BackendResultEnum('waiting'))
# optional message from the backend/whatever
diff --git a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py b/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py
index c690833..83c2754 100644
--- a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py
+++ b/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py
@@ -79,7 +79,7 @@ class TestCoprDeleteBuild(CoprsTestCase):
act = self.models.Action.query.first()
assert act.object_type == 'build'
assert act.old_value == 'user1/foocopr'
- assert act.new_value == pkgs
+ assert act.data == pkgs
@TransactionDecorator('u2')
def test_copr_build_non_submitter_cannot_delete_build(self, f_users, f_coprs, f_mock_chroots, f_builds, f_db):
10 years, 5 months
[copr] new: [tests] return exit code from manage.py test (4c9864a)
by Richard Marko
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : new
>---------------------------------------------------------------
commit 4c9864a079a59227cdc1997e447346388b2b0c0d
Author: Richard Marko <rmarko(a)fedoraproject.org>
Date: Mon Jan 20 16:33:19 2014 +0100
[tests] return exit code from manage.py test
Signed-off-by: Richard Marko <rmarko(a)fedoraproject.org>
>---------------------------------------------------------------
coprs_frontend/manage.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/manage.py b/coprs_frontend/manage.py
index 01bcbf7..0b9cac0 100755
--- a/coprs_frontend/manage.py
+++ b/coprs_frontend/manage.py
@@ -19,7 +19,7 @@ class TestCommand(Command):
if not (('COPR_CONFIG' in os.environ) and os.environ['COPR_CONFIG']):
os.environ['COPR_CONFIG'] = '/etc/copr/copr_unit_test.conf'
os.environ['PYTHONPATH'] = '.'
- subprocess.call(['py.test'] + (test_args or []))
+ return subprocess.call(['py.test'] + (test_args or []))
option_list = (
Option('-a',
10 years, 5 months
[copr] new: [frontend] 1054474 - drop Copr.build_count nonsense (1470b3e)
by Richard Marko
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : new
>---------------------------------------------------------------
commit 1470b3ee49090f791bd6b6bbc01f1122784f7b2e
Author: Richard Marko <rmarko(a)fedoraproject.org>
Date: Mon Jan 20 17:19:25 2014 +0100
[frontend] 1054474 - drop Copr.build_count nonsense
Signed-off-by: Richard Marko <rmarko(a)fedoraproject.org>
>---------------------------------------------------------------
.../versions/4837ad1d96ea_drop_copr_build_coun.py | 24 ++++++++++++++++++++
coprs_frontend/coprs/logic/builds_logic.py | 1 -
coprs_frontend/coprs/logic/coprs_logic.py | 5 ----
coprs_frontend/coprs/models.py | 8 +++++-
4 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/coprs_frontend/alembic/versions/4837ad1d96ea_drop_copr_build_coun.py b/coprs_frontend/alembic/versions/4837ad1d96ea_drop_copr_build_coun.py
new file mode 100644
index 0000000..80a402a
--- /dev/null
+++ b/coprs_frontend/alembic/versions/4837ad1d96ea_drop_copr_build_coun.py
@@ -0,0 +1,24 @@
+"""drop Copr.build_count
+
+Revision ID: 4837ad1d96ea
+Revises: 294405dfc7c0
+Create Date: 2014-01-20 17:05:20.917522
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '4837ad1d96ea'
+down_revision = '294405dfc7c0'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+ """ Drop 'build_count' colum from copr table. """
+ op.drop_column('copr', 'build_count')
+
+
+def downgrade():
+ """ Add 'build_count' colum to copr table. """
+ op.add_column('copr', sa.Column('build_count', sa.Integer(default=0)))
diff --git a/coprs_frontend/coprs/logic/builds_logic.py b/coprs_frontend/coprs/logic/builds_logic.py
index 7721b30..9af4344 100644
--- a/coprs_frontend/coprs/logic/builds_logic.py
+++ b/coprs_frontend/coprs/logic/builds_logic.py
@@ -79,7 +79,6 @@ class BuildsLogic(object):
if not build.user:
build.user = user
- coprs_logic.CoprsLogic.increment_build_count(user, copr)
db.session.add(build)
# add BuildChroot object for each active chroot
diff --git a/coprs_frontend/coprs/logic/coprs_logic.py b/coprs_frontend/coprs/logic/coprs_logic.py
index ee511fb..49b18f2 100644
--- a/coprs_frontend/coprs/logic/coprs_logic.py
+++ b/coprs_frontend/coprs/logic/coprs_logic.py
@@ -162,11 +162,6 @@ class CoprsLogic(object):
return existing
@classmethod
- def increment_build_count(cls, user, copr): # TODO API of this method is different, maybe change?
- models.Copr.query.filter(models.Copr.id == copr.id).\
- update({models.Copr.build_count: models.Copr.build_count + 1})
-
- @classmethod
def unfinished_blocking_actions_for(cls, user, copr):
blocking_actions = [helpers.ActionTypeEnum('rename'),
helpers.ActionTypeEnum('delete')]
diff --git a/coprs_frontend/coprs/models.py b/coprs_frontend/coprs/models.py
index 527461b..2cdb0ed 100644
--- a/coprs_frontend/coprs/models.py
+++ b/coprs_frontend/coprs/models.py
@@ -148,8 +148,6 @@ class Copr(db.Model, Serializer):
# description and instructions given by copr owner
description = db.Column(db.Text)
instructions = db.Column(db.Text)
- # duplicate information, but speeds up a lot and makes queries simpler
- build_count = db.Column(db.Integer, default = 0)
deleted = db.Column(db.Boolean, default=False)
# relations
@@ -183,6 +181,12 @@ class Copr(db.Model, Serializer):
"""Returns list of active mock_chroots of this copr"""
return filter(lambda x: x.is_active, self.mock_chroots)
+ @property
+ def build_count(self):
+ """ Return number of builds in this copr """
+
+ return len(self.builds)
+
def check_copr_chroot(self, chroot):
"""Return object of chroot, if is related to our copr or None"""
result = None
10 years, 5 months
[copr] new: [frontend] rename MockChroot.chroot_name to .name (0f07a1d)
by Richard Marko
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : new
>---------------------------------------------------------------
commit 0f07a1da2e21f95105a0d9cb0612b8592ae22aee
Author: Richard Marko <rmarko(a)fedoraproject.org>
Date: Tue Jan 21 12:51:00 2014 +0100
[frontend] rename MockChroot.chroot_name to .name
Signed-off-by: Richard Marko <rmarko(a)fedoraproject.org>
>---------------------------------------------------------------
coprs_frontend/coprs/forms.py | 4 ++--
coprs_frontend/coprs/logic/builds_logic.py | 2 +-
coprs_frontend/coprs/logic/coprs_logic.py | 2 +-
coprs_frontend/coprs/models.py | 4 ++--
.../coprs/templates/coprs/detail/edit_chroot.html | 6 +++---
.../coprs/templates/coprs/detail/overview.html | 2 +-
.../coprs/views/backend_ns/backend_general.py | 2 +-
coprs_frontend/manage.py | 2 +-
.../tests/test_logic/test_builds_logic.py | 2 +-
.../test_views/test_coprs_ns/test_coprs_general.py | 12 ++++++------
10 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/coprs_frontend/coprs/forms.py b/coprs_frontend/coprs/forms.py
index d898654..c5dfa42 100644
--- a/coprs_frontend/coprs/forms.py
+++ b/coprs_frontend/coprs/forms.py
@@ -129,7 +129,7 @@ class CoprFormFactory(object):
have_any = True
return have_any
- F.chroots_list = map(lambda x: x.chroot_name,
+ F.chroots_list = map(lambda x: x.name,
models.MockChroot.query.filter(
models.MockChroot.is_active == True
).all())
@@ -138,7 +138,7 @@ class CoprFormFactory(object):
F.chroots_sets = {}
for ch in F.chroots_list:
checkbox_default = False
- if mock_chroots and ch in map(lambda x: x.chroot_name,
+ if mock_chroots and ch in map(lambda x: x.name,
mock_chroots):
checkbox_default = True
diff --git a/coprs_frontend/coprs/logic/builds_logic.py b/coprs_frontend/coprs/logic/builds_logic.py
index 9af4344..dc4851c 100644
--- a/coprs_frontend/coprs/logic/builds_logic.py
+++ b/coprs_frontend/coprs/logic/builds_logic.py
@@ -95,7 +95,7 @@ class BuildsLogic(object):
if 'chroot' in upd_dict:
# update respective chroot status
for build_chroot in build.build_chroots:
- if build_chroot.mock_chroot.chroot_name == upd_dict['chroot']:
+ if build_chroot.name == upd_dict['chroot']:
if 'status' in upd_dict:
build_chroot.status = upd_dict['status']
diff --git a/coprs_frontend/coprs/logic/coprs_logic.py b/coprs_frontend/coprs/logic/coprs_logic.py
index 49b18f2..0a07d66 100644
--- a/coprs_frontend/coprs/logic/coprs_logic.py
+++ b/coprs_frontend/coprs/logic/coprs_logic.py
@@ -238,7 +238,7 @@ class CoprChrootsLogic(object):
db_chroots = models.MockChroot.query.all()
mock_chroots = []
for ch in db_chroots:
- if ch.chroot_name in names:
+ if ch.name in names:
mock_chroots.append(ch)
return mock_chroots
diff --git a/coprs_frontend/coprs/models.py b/coprs_frontend/coprs/models.py
index 2cdb0ed..5f733f3 100644
--- a/coprs_frontend/coprs/models.py
+++ b/coprs_frontend/coprs/models.py
@@ -298,7 +298,7 @@ class MockChroot(db.Model, Serializer):
is_active = db.Column(db.Boolean, default = True)
@property
- def chroot_name(self):
+ def name(self):
"""Textual representation of name of this chroot"""
if self.os_version:
format_string = '{rel}-{ver}-{arch}'
@@ -332,7 +332,7 @@ class BuildChroot(db.Model, Serializer):
@property
def name(self):
""" Textual representation of name of this chroot """
- return self.mock_chroot.chroot_name
+ return self.mock_chroot.name
@property
def state(self):
diff --git a/coprs_frontend/coprs/templates/coprs/detail/edit_chroot.html b/coprs_frontend/coprs/templates/coprs/detail/edit_chroot.html
index d0d748d..fac9a65 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/edit_chroot.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/edit_chroot.html
@@ -1,13 +1,13 @@
{% extends "coprs/detail/edit2.html" %}
{% from "_helpers.html" import render_field %}
-{% block title %}Editing {{ copr.owner.name }}/{{ copr.name }}/{{ chroot.chroot_name }}{% endblock %}
+{% block title %}Editing {{ copr.owner.name }}/{{ copr.name }}/{{ chroot.name }}{% endblock %}
{% block edit_selected %}selected{% endblock %}
{% block edit_chroot_selected %}selected{% endblock %}
{% block detail_body2 %}
- <h2>Edit chroot '{{ chroot.chroot_name }}'</h2>
- <form action="{{ url_for('coprs_ns.chroot_update', username = copr.owner.name, coprname = copr.name, chrootname = chroot.chroot_name) }}" method=post class=add-entry>
+ <h2>Edit chroot '{{ chroot.name }}'</h2>
+ <form action="{{ url_for('coprs_ns.chroot_update', username = copr.owner.name, coprname = copr.name, chrootname = chroot.name) }}" method=post class=add-entry>
<dl>
{{ form.csrf_token }}
{{ render_field(form.buildroot_pkgs, size=80, placeholder='Space separated list of packages. E.g.: scl-utils-build ruby193-build') }}
diff --git a/coprs_frontend/coprs/templates/coprs/detail/overview.html b/coprs_frontend/coprs/templates/coprs/detail/overview.html
index 456b541..7e2e0f8 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/overview.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/overview.html
@@ -49,7 +49,7 @@
'coprs_ns.generate_repo_file',
username=copr.owner.name,
coprname=copr.name,
- chroot=mock_chroot.chroot_name) }}">
+ chroot=mock_chroot.name) }}">
{{ copr.owner.name }}-{{ copr.name }}.repo</a></td>
{% else %}
<td></td>
diff --git a/coprs_frontend/coprs/views/backend_ns/backend_general.py b/coprs_frontend/coprs/views/backend_ns/backend_general.py
index 29bac58..9029fd6 100644
--- a/coprs_frontend/coprs/views/backend_ns/backend_general.py
+++ b/coprs_frontend/coprs/views/backend_ns/backend_general.py
@@ -38,7 +38,7 @@ def waiting():
# is assigned with
for chroot in build.chroots:
build_dict_copy = build_dict.copy()
- build_dict_copy['chroot'] = chroot.chroot_name
+ build_dict_copy['chroot'] = chroot.name
build_dict_copy['buildroot_pkgs'] = build.copr.buildroot_pkgs(chroot)
builds_list.append(build_dict_copy)
diff --git a/coprs_frontend/manage.py b/coprs_frontend/manage.py
index 0b9cac0..5367a31 100755
--- a/coprs_frontend/manage.py
+++ b/coprs_frontend/manage.py
@@ -129,7 +129,7 @@ class DisplayChrootsCommand(Command):
'Displays current mock chroots'
def run(self, active_only):
for ch in coprs_logic.MockChrootsLogic.get_multiple(None, active_only=active_only).all():
- print ch.chroot_name
+ print ch.name
option_list = (
Option('--active-only',
diff --git a/coprs_frontend/tests/test_logic/test_builds_logic.py b/coprs_frontend/tests/test_logic/test_builds_logic.py
index 2fe03a8..66be19b 100644
--- a/coprs_frontend/tests/test_logic/test_builds_logic.py
+++ b/coprs_frontend/tests/test_logic/test_builds_logic.py
@@ -11,7 +11,7 @@ class TestBuildsLogic(CoprsTestCase):
self.db.session.commit()
b = BuildsLogic.add(self.u2, 'blah blah', self.c2)
self.db.session.commit()
- assert b.chroots[0].chroot_name == self.mc3.chroot_name
+ assert b.chroots[0].name == self.mc3.name
def test_add_raises_if_copr_has_unfinished_actions(self, f_users, f_coprs, f_actions, f_db):
with pytest.raises(ActionInProgressException):
diff --git a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py b/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
index c539d1e..2010777 100644
--- a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
+++ b/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
@@ -211,7 +211,7 @@ class TestCoprUpdate(CoprsTestCase):
def test_update_multiple_chroots(self, f_users, f_coprs, f_copr_permissions, f_mock_chroots, f_db):
self.db.session.add_all([self.u1, self.c1, self.mc1, self.mc2, self.mc3])
r = self.test_client.post('/coprs/{0}/{1}/update/'.format(self.u1.name, self.c1.name),
- data = {'name': self.c1.name, self.mc2.chroot_name: 'y', self.mc3.chroot_name: 'y', 'id': self.c1.id},
+ data = {'name': self.c1.name, self.mc2.name: 'y', self.mc3.name: 'y', 'id': self.c1.id},
follow_redirects = True)
assert 'Project was updated successfully' in r.data
self.c1 = self.db.session.merge(self.c1)
@@ -222,10 +222,10 @@ class TestCoprUpdate(CoprsTestCase):
mock_chroots = self.models.MockChroot.query.join(self.models.CoprChroot).\
filter(self.models.CoprChroot.copr_id==\
self.c1.id).all()
- mock_chroots_names = map(lambda x: x.chroot_name, mock_chroots)
- assert self.mc2.chroot_name in mock_chroots_names
- assert self.mc3.chroot_name in mock_chroots_names
- assert self.mc1.chroot_name not in mock_chroots_names
+ mock_chroots_names = map(lambda x: x.name, mock_chroots)
+ assert self.mc2.name in mock_chroots_names
+ assert self.mc3.name in mock_chroots_names
+ assert self.mc1.name not in mock_chroots_names
@TransactionDecorator('u2')
def test_update_deletes_multiple_chroots(self, f_users, f_coprs, f_copr_permissions, f_mock_chroots, f_db):
@@ -237,7 +237,7 @@ class TestCoprUpdate(CoprsTestCase):
self.c2.copr_chroots.append(cc)
r = self.test_client.post('/coprs/{0}/{1}/update/'.format(self.u2.name, self.c2.name),
- data = {'name': self.c2.name, self.mc1.chroot_name: 'y', 'id': self.c2.id},
+ data = {'name': self.c2.name, self.mc1.name: 'y', 'id': self.c2.id},
follow_redirects = True)
assert 'Project was updated successfully' in r.data
self.c2 = self.db.session.merge(self.c2)
10 years, 5 months
[copr] master: mockremote: rawhide instead of $releasever in repos when in rawhide chroot (64c4bef)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 64c4befe5fdfc7758ccd8684a04edca3478bcffc
Author: Igor Gnatenko <i.gnatenko.brain(a)gmail.com>
Date: Mon Jan 20 18:10:36 2014 +0400
mockremote: rawhide instead of $releasever in repos when in rawhide chroot
When we add path to repo in repolist we adding
http://xxx/fedora-$releasever-$basearch. Mock should interp this as
http://xxx/fedora-rawhide-$basearch for rawhide chroots.
We will replace "$releasever" with "rawhide" when we building in rawhide
chroot.
We could request from user release repos and rawhide repos, but this isn't convenient.
Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1055325
Signed-off-by: Igor Gnatenko <i.gnatenko.brain(a)gmail.com>
>---------------------------------------------------------------
backend/mockremote.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/backend/mockremote.py b/backend/mockremote.py
index 7129bc8..1f348aa 100755
--- a/backend/mockremote.py
+++ b/backend/mockremote.py
@@ -326,6 +326,8 @@ class Builder(object):
# construct the mockchain command
buildcmd = "%s -r %s -l %s " % (mockchain, pipes.quote(self.chroot), pipes.quote(self.remote_build_dir))
for r in self.repos:
+ if "rawhide" in self.chroot:
+ r = r.replace("$releasever", "rawhide")
buildcmd += "-a %s " % pipes.quote(r)
if self.mockremote.macros:
10 years, 5 months