bodhi January 2010

bodhi@lists.fedorahosted.org

3 participants
31 discussions

2 commits - bodhi/controllers.py bodhi/tests bodhi/tools
by Luke Macken 15 Jan '10

15 Jan '10

bodhi/controllers.py | 11 ++++++-- bodhi/tests/test_controllers.py | 49 ++++++++++++++++++++++++++++++++++++++++ bodhi/tools/tagcheck.py | 4 +-- 3 files changed, 59 insertions(+), 5 deletions(-) New commits: commit 5ac115ff389c0c736d0204e6b2eda2552f30346f Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 15 15:54:59 2010 -0500 Add a pushed_since argument to our query API diff --git a/bodhi/controllers.py b/bodhi/controllers.py index f0c0605..63b61a4 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -223,11 +223,12 @@ class Root(controllers.RootController): 'username': validators.UnicodeString(), 'count_only': validators.StringBool(), 'created_since': validators.UnicodeString(), + 'pushed_since': validators.UnicodeString(), }) def list(self, release=None, bugs=None, cves=None, status=None, type_=None, package=None, mine=False, get_auth=False, username=None, start_date=None, end_date=None, count_only=False, - created_since=None, **kw): + created_since=None, pushed_since=None, **kw): """ Return a list of updates based on given parameters """ log.debug('list(%s)' % locals()) query = [] @@ -241,7 +242,8 @@ class Root(controllers.RootController): # If no arguments are specified, return the most recent updates if not release and not bugs and not cves and not status and not type_ \ - and not package and not mine and not username and not created_since: + and not package and not mine and not username and not created_since \ + and not pushed_since: log.debug("No arguments, returning latest") updates = PackageUpdate.select(orderBy=orderBy).reversed() num_items = updates.count() @@ -272,8 +274,11 @@ class Root(controllers.RootController): if created_since: created_since = datetime(*time.strptime(created_since, '%Y-%m-%d %H:%M:%S')[:-2]) - log.debug('Querying updates created since %s' % created_since) query.append(PackageUpdate.q.date_submitted >= created_since) + if pushed_since: + pushed_since = datetime(*time.strptime(pushed_since, + '%Y-%m-%d %H:%M:%S')[:-2]) + query.append(PackageUpdate.q.date_pushed >= pushed_since) if start_date: start_date = datetime(*time.strptime(start_date, '%Y-%m-%d %H:%M:%S')[:-2]) diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index b63c9c6..4ba206e 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1558,6 +1558,55 @@ class TestControllers(testutil.DBTest): json = simplejson.loads(cherrypy.response.body[0]) assert json['num_items'] == 0 + def test_pushed_since(self): + session = login() + create_release() + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + + # Pretend it's pushed to stable + update.pushed = True + update.status = 'stable' + update.date_pushed = datetime(2010, 01, 01, 12, 00, 00) + + ## Test web UI + testutil.create_request('/updates/list?%s' % + urlencode({'pushed_since': str(update.date_pushed)}), + method='GET', headers=session) + + assert '1 update found' in cherrypy.response.body[0] + assert 'kernel-2.6.31-1.fc7' in cherrypy.response.body[0] + + ## Test JSON API + testutil.create_request('/updates/list?%s' % + urlencode({'pushed_since': str(update.date_pushed), + 'tg_format': 'json'}), + method='GET', headers=session) + + json = simplejson.loads(cherrypy.response.body[0]) + assert json['num_items'] == 1 + assert json['updates'][0]['title'] == params['builds'] + + testutil.create_request('/updates/list?%s' % + urlencode({ + 'tg_format': 'json', + 'pushed_since': str(update.date_pushed + timedelta(days=1)), + }), + method='GET', headers=session) + + json = simplejson.loads(cherrypy.response.body[0]) + assert json['num_items'] == 0 + def test_query_limit(self): session = login() create_release() commit 62bce2dc04fad0b8d1215b9c9679a6d039e611d3 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 15 15:41:27 2010 -0500 Only compare against the latest tagged builds in bodhi-tagcheck diff --git a/bodhi/tools/tagcheck.py b/bodhi/tools/tagcheck.py index 5e54bb5..c80603f 100755 --- a/bodhi/tools/tagcheck.py +++ b/bodhi/tools/tagcheck.py @@ -35,7 +35,7 @@ def main(): # Check all candidate updates to see if they are in a different bodhi state for release in Release.select(): tag = release.candidate_tag - tagged = [build['nvr'] for build in koji.listTagged(tag)] + tagged = [build['nvr'] for build in koji.listTagged(tag, latest=True)] for nvr in tagged: try: build = PackageBuild.byNvr(nvr) @@ -58,7 +58,7 @@ def main(): # in bodhi, and are in the expect state. for release in Release.select(): for tag in (release.testing_tag, release.stable_tag): - tagged = [build['nvr'] for build in koji.listTagged(tag)] + tagged = [build['nvr'] for build in koji.listTagged(tag, latest=True)] for nvr in tagged: try: build = PackageBuild.byNvr(nvr)

1 0

bodhi/controllers.py bodhi/search.py bodhi/tests
by Luke Macken 13 Jan '10

13 Jan '10

bodhi/controllers.py | 10 ++++---- bodhi/search.py | 4 +-- bodhi/tests/test_controllers.py | 46 ++++++++++++++++++++++++++++++++++++---- 3 files changed, 49 insertions(+), 11 deletions(-) New commits: commit 2681e88dd8c5acdeedfef58d9aab5e6aa57f6fd9 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 13 21:59:40 2010 -0500 Fix the pagination deprecation warnings, and add a test case for our limits diff --git a/bodhi/controllers.py b/bodhi/controllers.py index bd91405..f0c0605 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -210,7 +210,7 @@ class Root(controllers.RootController): return updates @expose(template="bodhi.templates.list", allow_json=True) - @paginate('updates', limit=20, max_limit=50, allow_limit_override=True) + @paginate('updates', limit=20, max_limit=1000) @validate(validators={ 'release': validators.UnicodeString(), 'bugs': validators.UnicodeString(), @@ -370,7 +370,7 @@ class Root(controllers.RootController): @expose(template="bodhi.templates.mine", allow_json=True) @identity.require(identity.not_anonymous()) - @paginate('updates', limit=20, max_limit=20, allow_limit_override=True) + @paginate('updates', limit=20, max_limit=20) def mine(self): """ List all updates submitted by the current user """ updates = PackageUpdate.select( @@ -872,7 +872,7 @@ class Root(controllers.RootController): raise redirect(updates[0].get_url()) @expose(template='bodhi.templates.list') - @paginate('updates', limit=20, max_limit=20, allow_limit_override=True) + @paginate('updates', limit=20, max_limit=20) def default(self, *args, **kw): """ This method allows for the following requests @@ -1093,7 +1093,7 @@ class Root(controllers.RootController): raise redirect('/') @expose(template='bodhi.templates.comments') - @paginate('comments', limit=20, max_limit=20, allow_limit_override=True) + @paginate('comments', limit=20, max_limit=20) def comments(self): data = Comment.select(Comment.q.author != 'bodhi', orderBy=Comment.q.timestamp).reversed() @@ -1177,7 +1177,7 @@ class Root(controllers.RootController): return dict(updates=updates) @expose(template="bodhi.templates.user") - @paginate('updates', limit=25, max_limit=20, allow_limit_override=True) + @paginate('updates', limit=25, max_limit=20) def user(self, username): """ Return a list of updates submitted by a given person """ updates = PackageUpdate.select(PackageUpdate.q.submitter == username, diff --git a/bodhi/search.py b/bodhi/search.py index 4f13c9c..6e1913a 100644 --- a/bodhi/search.py +++ b/bodhi/search.py @@ -41,8 +41,8 @@ class SearchController(Controller): @expose(template="bodhi.templates.search") @validate(validators={ "search" : validators.UnicodeString() }) @error_handler(index) - @paginate('updates', default_order='date_submitted', default_reversed=True, - limit=25, allow_limit_override=True) + @paginate('updates', default_order='-date_submitted', + limit=20, max_limit=1000) def default(self, search, *args, **kw): results = set() diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index e066a0c..b63c9c6 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1196,7 +1196,6 @@ class TestControllers(testutil.DBTest): testutil.create_request('/updates/get_updates_from_builds?builds=' + 'kernel-2.6.29.1-111.fc7.x86_64%20TurboGears-1.0.2.2-2.fc7', method='POST') - import simplejson json = simplejson.loads(cherrypy.response.body[0]) assert 'kernel-2.6.29.1-111.fc7.x86_64' in json assert 'TurboGears-1.0.2.2-2.fc7' in json @@ -1510,9 +1509,6 @@ class TestControllers(testutil.DBTest): assert "Mark Critical Path update as Stable" in cherrypy.response.body[0] def test_created_since(self): - """ - Ensure admins can submit critpath updates for pending releases to stable - """ session = login() create_release() params = { @@ -1561,3 +1557,45 @@ class TestControllers(testutil.DBTest): json = simplejson.loads(cherrypy.response.body[0]) assert json['num_items'] == 0 + + def test_query_limit(self): + session = login() + create_release() + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + #update = PackageUpdate.byTitle(params['builds']) + + # Create 100 updates + for prefix in xrange(100): + update = params.copy() + update['builds'] = '%s%d%s' % (update['builds'][0], prefix, + update['builds'][1:]) + self.save_update(update, session) + + assert PackageUpdate.select().count() == 100, PackageUpdate.select().count() + + ## Test default limit + testutil.create_request('/updates/list?tg_format=json', method='GET', + headers=session) + + assert '100 updates found' in cherrypy.response.body[0], cherrypy.response.body[0] + json = simplejson.loads(cherrypy.response.body[0]) + assert json['num_items'] == 100, json['num_items'] + assert len(json['updates']) == 20, len(json['updates']) + + ## Try getting all 100 + testutil.create_request('/updates/list?tg_format=json&tg_paginate_limit=100', + method='GET', headers=session) + + assert '100 updates found' in cherrypy.response.body[0], cherrypy.response.body[0] + json = simplejson.loads(cherrypy.response.body[0]) + assert json['num_items'] == 100, json['num_items'] + assert len(json['updates']) == 100, len(json['updates'])

1 0

2 commits - bodhi/controllers.py bodhi/tests
by Luke Macken 13 Jan '10

13 Jan '10

bodhi/controllers.py | 17 ++++++++-- bodhi/tests/test_controllers.py | 64 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 72 insertions(+), 9 deletions(-) New commits: commit 83250e00a8d411eb6a419d65a699bdbf22be046a Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 13 16:31:06 2010 -0500 Fix a bug with our tests diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index 30fcb92..e066a0c 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1551,7 +1551,6 @@ class TestControllers(testutil.DBTest): assert json['num_items'] == 1 assert json['updates'][0]['title'] == params['builds'] - testutil.capture_log(['bodhi.model', 'bodhi.controllers']) testutil.create_request('/updates/list?%s' % urlencode({ 'tg_format': 'json', @@ -1561,4 +1560,4 @@ class TestControllers(testutil.DBTest): method='GET', headers=session) json = simplejson.loads(cherrypy.response.body[0]) - assert json['num_items'] == 0, testutil.get_log() + assert json['num_items'] == 0 commit c2aa41e8c61ce6041e0cce00e7923b9579c3f2a7 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 13 15:58:20 2010 -0500 Add a 'created_since' argument to our query API that returns updates that have been created since a given date. diff --git a/bodhi/controllers.py b/bodhi/controllers.py index 8af5184..bd91405 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -222,10 +222,12 @@ class Root(controllers.RootController): 'get_auth': validators.StringBool(), 'username': validators.UnicodeString(), 'count_only': validators.StringBool(), + 'created_since': validators.UnicodeString(), }) def list(self, release=None, bugs=None, cves=None, status=None, type_=None, package=None, mine=False, get_auth=False, username=None, - start_date=None, end_date=None, count_only=False, **kw): + start_date=None, end_date=None, count_only=False, + created_since=None, **kw): """ Return a list of updates based on given parameters """ log.debug('list(%s)' % locals()) query = [] @@ -239,7 +241,7 @@ class Root(controllers.RootController): # If no arguments are specified, return the most recent updates if not release and not bugs and not cves and not status and not type_ \ - and not package and not mine and not username: + and not package and not mine and not username and not created_since: log.debug("No arguments, returning latest") updates = PackageUpdate.select(orderBy=orderBy).reversed() num_items = updates.count() @@ -267,11 +269,18 @@ class Root(controllers.RootController): PackageUpdate.q.submitter == identity.current.user_name) if username: query.append(PackageUpdate.q.submitter == username) + if created_since: + created_since = datetime(*time.strptime(created_since, + '%Y-%m-%d %H:%M:%S')[:-2]) + log.debug('Querying updates created since %s' % created_since) + query.append(PackageUpdate.q.date_submitted >= created_since) if start_date: - start_date = datetime(*time.strptime(start_date, '%Y-%m-%d %H:%M:%S')[:-2]) + start_date = datetime(*time.strptime(start_date, + '%Y-%m-%d %H:%M:%S')[:-2]) query.append(PackageUpdate.q.date_pushed >= start_date) if end_date: - end_date = datetime(*time.strptime(end_date, '%Y-%m-%d %H:%M:%S')[:-2]) + end_date = datetime(*time.strptime(end_date, + '%Y-%m-%d %H:%M:%S')[:-2]) query.append(PackageUpdate.q.date_pushed <= end_date) updates = PackageUpdate.select(AND(*query), diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index c0dd645..30fcb92 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -2,23 +2,24 @@ # -*- coding: utf-8 -*- import os +import urllib +import simplejson import turbogears import cPickle as pickle -from datetime import datetime +from urllib import urlencode +from datetime import datetime, timedelta +from sqlobject import SQLObjectNotFound from turbogears import testutil, database, config turbogears.update_config(configfile='bodhi.cfg', modulename='bodhi.config') database.set_db_uri("sqlite:///:memory:") -import urllib -import cherrypy - -from sqlobject import SQLObjectNotFound from bodhi.model import Release, PackageUpdate, User, PackageBuild, Bugzilla, \ Group from bodhi.controllers import Root from bodhi.exceptions import DuplicateEntryError +import cherrypy cherrypy.root = Root() def create_release(num='7', dist='dist-fc', **kw): @@ -1507,3 +1508,57 @@ class TestControllers(testutil.DBTest): method='GET', headers=session) assert "Mark Critical Path update as Stable" in cherrypy.response.body[0] + + def test_created_since(self): + """ + Ensure admins can submit critpath updates for pending releases to stable + """ + session = login() + create_release() + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + + # Pretend it's pushed to stable + update.pushed = True + update.status = 'stable' + update.date_submitted = datetime(2010, 01, 01, 12, 00, 00) + + ## Test web UI + testutil.create_request('/updates/list?%s' % + urlencode({'created_since': str(update.date_submitted)}), + method='GET', headers=session) + + assert '1 update found' in cherrypy.response.body[0], cherrypy.response.body[0] + assert 'kernel-2.6.31-1.fc7' in cherrypy.response.body[0] + + ## Test JSON API + testutil.create_request('/updates/list?%s' % + urlencode({'created_since': str(update.date_submitted), + 'tg_format': 'json'}), + method='GET', headers=session) + + json = simplejson.loads(cherrypy.response.body[0]) + assert json['num_items'] == 1 + assert json['updates'][0]['title'] == params['builds'] + + testutil.capture_log(['bodhi.model', 'bodhi.controllers']) + testutil.create_request('/updates/list?%s' % + urlencode({ + 'tg_format': 'json', + 'created_since': str(update.date_submitted + + timedelta(days=1)), + }), + method='GET', headers=session) + + json = simplejson.loads(cherrypy.response.body[0]) + assert json['num_items'] == 0, testutil.get_log()

1 0

bodhi.spec
by Mathieu Bridon 10 Jan '10

10 Jan '10

bodhi.spec | 1 + 1 file changed, 1 insertion(+) New commits: commit f405798d726f0102fcc8695ba7b85a9d2cedf73b Author: Mathieu Bridon <bochecha(a)fedoraproject.org> Date: Sun Jan 10 19:51:15 2010 +0100 Ticket #286: Show an update example When displaying the update, parse the MarkDown syntax in the update notes to render nicely formatted HTML. This is a follow-up on commit e9318aa03cd2771fd4c4af42bd552ca465e6f3bd that introduced a new dependency on the markdown2 module. The spec file needed to be updated for the new Requires, which was forgotten in the previous commit. diff --git a/bodhi.spec b/bodhi.spec index 60e5da3..1749cde 100644 --- a/bodhi.spec +++ b/bodhi.spec @@ -58,6 +58,7 @@ Requires: python-tgcaptcha Requires: python-decorator Requires: mod_wsgi Requires: httpd +Requires: python-markdown2 %description server

1 0

2 commits - bodhi/static bodhi/templates bodhi/widgets.py
by Mathieu Bridon 10 Jan '10

10 Jan '10

bodhi/static/css/layout.css | 11 +++++++++++ bodhi/static/images/shadow2-big.png |binary bodhi/templates/new.kid | 2 +- bodhi/templates/show.kid | 6 +++++- bodhi/widgets.py | 10 ++++++++-- 5 files changed, 25 insertions(+), 4 deletions(-) New commits: commit e9318aa03cd2771fd4c4af42bd552ca465e6f3bd Author: Mathieu Bridon (bochecha) <bochecha(a)fedoraproject.org> Date: Sun Aug 30 12:20:02 2009 +0200 Ticket #286: Show an update example When displaying the update, parse the MarkDown syntax in the update notes to render nicely formatted HTML. diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid index e81518a..2fa903b 100644 --- a/bodhi/templates/show.kid +++ b/bodhi/templates/show.kid @@ -13,6 +13,8 @@ from cgi import escape from bodhi import util from turbogears import identity +from markdown2 import markdown +import re ## Link to build info and logs buildinfo = '' @@ -33,7 +35,9 @@ title = title[:-2] release = util.link(update.release.long_name, '/' + update.release.name) submitter = util.link(update.submitter, '/user/' + update.submitter) -notes = escape(update.notes).replace('\r\n', ' ') + +reg = re.compile(r'(^[-*] .*(?:\n[-*] .*)*)', re.MULTILINE) +notes = markdown(reg.sub(r'\n\1\n', escape(update.notes))) if update.karma < 0: karma = -1 elif update.karma > 0: karma = 1 commit b7f47f9f77b41556cacb2c1efa1d42079b4b8e6f Author: Mathieu Bridon (bochecha) <bochecha(a)fedoraproject.org> Date: Sun Aug 30 01:28:40 2009 +0200 Ticket #286: Show an update example New update notes tooltip now shows an example update with the use of MarkDown syntax. diff --git a/bodhi/static/css/layout.css b/bodhi/static/css/layout.css index eee822c..13d07c6 100644 --- a/bodhi/static/css/layout.css +++ b/bodhi/static/css/layout.css @@ -576,6 +576,17 @@ td.value { height: 100px; } +#tooltip.pretty-big { + width: 270px; +} + +#tooltip.pretty-big div { width: 270px; text-align: left; } + +#tooltip.fancy-big { + background: url('/updates/static/images/shadow2-big.png'); + height: 210px; +} + #main { padding: 1em; } #banner { padding: 15px; background-color: #06b; color: white; font-size: large; border-bottom: 1px solid #ccc; background: url(bg.gif) repeat-x; text-align: center } diff --git a/bodhi/static/images/shadow2-big.png b/bodhi/static/images/shadow2-big.png new file mode 100644 index 0000000..fdde8ae Binary files /dev/null and b/bodhi/static/images/shadow2-big.png differ diff --git a/bodhi/templates/new.kid b/bodhi/templates/new.kid index a6cd3a9..40c8933 100644 --- a/bodhi/templates/new.kid +++ b/bodhi/templates/new.kid @@ -24,7 +24,7 @@ fixPNG: true, opacity: 1 }); $("#form_notes").Tooltip({ - extraClass: "pretty fancy", showBody: " - ", left: 5, top: -15, + extraClass: "pretty fancy pretty-big fancy-big", showBody: " - ", left: 5, top: -15, fixPNG: true, opacity: 1 }); $("#form_bugs").Tooltip({ diff --git a/bodhi/widgets.py b/bodhi/widgets.py index bf2f98f..87141af 100644 --- a/bodhi/widgets.py +++ b/bodhi/widgets.py @@ -99,9 +99,15 @@ class NewUpdateForm(Form): 'CVE-2008-0001'}), TextArea('notes', validator=validators.UnicodeString(), rows=13, cols=65, - attrs={'title' : 'Advisory Notes - Some optional details ' + attrs={'title' : 'Advisory Notes - Some optional details ' 'about this update that will appear in ' - 'the notice'}), + 'the notice.' + 'Exemple: ' + 'This is an update that fixes problems with ' + '**connecting to a share**.' + 'The following things *break*:' + '* Browsing with `<code>gnome-app-install</code>` ' + '* Emailing'}), CheckBox(name='close_bugs', help_text='Automatically close bugs', validator=validators.StringBool(), default=True, attrs={'title' : 'Close Bugs - '

1 0

bodhi/tools
by Mathieu Bridon 10 Jan '10

10 Jan '10

bodhi/tools/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c87f4b12f87b01befedcd46a3507d8563148732a Author: Mathieu Bridon (bochecha) <bochecha(a)fedoraproject.org> Date: Thu Aug 27 22:17:28 2009 +0200 Ticket #325: Unable to download F11 (i586) update Add the support for i586 arch downloads, necessary on Fedora 11. diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py index e648aa3..77d9a7c 100755 --- a/bodhi/tools/client.py +++ b/bodhi/tools/client.py @@ -338,7 +338,7 @@ def main(): for build in update['builds']: subprocess.call('koji download-build --arch=%s ' '--arch=noarch%s %s' % (arch, - arch == 'i686' and ' --arch=i386' + arch == 'i686' and ' --arch=i386 --arch=i586' or '', build['nvr']), shell=True) else:

1 0

bodhi/templates bodhi/tests
by Luke Macken 07 Jan '10

07 Jan '10

bodhi/templates/show.kid | 36 ++++++++++++++++++++++--------- bodhi/tests/test_controllers.py | 46 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 11 deletions(-) New commits: commit b460f3b9ba02b9aba9ed5362dc7879df92faa402 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 22:08:20 2010 -0500 [No Frozen Rawhide] Fix some of our update action logic, along with tests diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid index 8e7c8af..e81518a 100644 --- a/bodhi/templates/show.kid +++ b/bodhi/templates/show.kid @@ -69,14 +69,23 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k </td> - <td> - <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> - <img src="${tg.url('/static/images/submit.png')}" border="0"/> - Push Critical Path update to Stable - </a> - </td> + <td> + <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> + <img src="${tg.url('/static/images/submit.png')}" border="0"/> + Push Critical Path update to Stable + </a> + </td> + + + + <td> + <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> + <img src="${tg.url('/static/images/submit.png')}" border="0"/> + Push to Stable + </a> + </td> - + <td> <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/submit.png')}" border="0"/> @@ -84,7 +93,6 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k </a> </td> - <td> <a href="${util.url('/confirm_delete?nvr=%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/trash.png')}" border="0"/> @@ -118,15 +126,23 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k </td> - + <td> <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/submit.png')}" border="0"/> Mark as Stable </a> </td> - + + + <td> + <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> + <img src="${tg.url('/static/images/submit.png')}" border="0"/> + Mark as Stable + </a> + </td> + <td> <a href="${util.url('/edit/%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/edit.png')}" border="0"/> diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index ad6a029..c0dd645 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1264,6 +1264,50 @@ class TestControllers(testutil.DBTest): update = PackageUpdate.byTitle(params['builds']) assert update.request == 'stable' + def test_critpath_actions_in_normal_release(self): + session = login() + create_release() + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == None + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + assert "Push to Stable" in cherrypy.response.body[0] + assert "Push to Testing" in cherrypy.response.body[0] + + def test_non_critpath_actions_in_normal_release(self): + session = login() + create_release() + params = { + 'builds' : 'nethack-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == None + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + assert "Push to Testing" in cherrypy.response.body[0] + assert "Push to Stable" in cherrypy.response.body[0], cherrypy.response.body[0] + def test_push_critpath_to_frozen_release(self): session = login() create_release(locked=True) @@ -1434,7 +1478,7 @@ class TestControllers(testutil.DBTest): testutil.create_request('/updates/%s' % params['builds'], method='GET', headers=session) - assert "/updates/request/stable" in cherrypy.response.body[0] + assert "/updates/request/stable" in cherrypy.response.body[0], cherrypy.response.body[0] def test_critpath_to_frozen_release_testing_admin_actions(self): """

1 0

bodhi/controllers.py
by Luke Macken 07 Jan '10

07 Jan '10

bodhi/controllers.py | 6 ++++++ 1 file changed, 6 insertions(+) New commits: commit c4f45b454be100820bc1ee36c2c8cabfe4bb0994 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 17:30:47 2010 -0500 After we unpush an edited update, be sure to refresh the tags (infra#3227). diff --git a/bodhi/controllers.py b/bodhi/controllers.py index 7b134e5..8af5184 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -623,6 +623,12 @@ class Root(controllers.RootController): raise InvalidUpdateException(params) edited.unpush() + # Refresh the tags for these builds + for build in edited.builds: + if build.nvr in buildinfo: + buildinfo[build.nvr]['tags'] = [tag['name'] for tag in + koji.listTags(build.nvr)] + # Make sure all builds are tagged appropriately. We also determine # which builds get pushed for which releases, based on the tag. for build in builds:

1 0

bodhi/model.py bodhi/tests
by Luke Macken 07 Jan '10

07 Jan '10

bodhi/model.py | 1 + bodhi/tests/test_controllers.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 332cbb03dd7ce5cb4ea82557372ecec2df627400 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 14:12:12 2010 -0500 Fix some unit tests that I just broke diff --git a/bodhi/model.py b/bodhi/model.py index 6c93521..3428379 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -335,6 +335,7 @@ class PackageUpdate(SQLObject): time.localtime()[0],id) log.debug("Setting updateid for %s to %s" % (self.title, self.updateid)) + self.date_pushed = datetime.utcnow() hub.commit() def set_request(self, action, pathcheck=True): diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index 916d297..ad6a029 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1260,7 +1260,7 @@ class TestControllers(testutil.DBTest): testutil.capture_log(["bodhi.util", "bodhi.controllers", "bodhi.model"]) self.save_update(params, session) log = testutil.get_log() - assert "Update successfully created. You're pushing a critical path package directly to stable. Please consider pushing to testing first!" in log, log + assert "Update successfully created. You're pushing a critical path package directly to stable, which is strongly discouraged. Please consider pushing to testing first!" in log, log update = PackageUpdate.byTitle(params['builds']) assert update.request == 'stable'

1 0

16 commits - bodhi/admin.py bodhi/config bodhi/controllers.py bodhi/masher.py bodhi/model.py bodhi/templates bodhi/tests
by Luke Macken 07 Jan '10

07 Jan '10

bodhi/admin.py | 11 + bodhi/config/app.cfg | 8 + bodhi/controllers.py | 14 ++ bodhi/masher.py | 9 + bodhi/model.py | 30 +++++ bodhi/templates/show.kid | 40 +++++-- bodhi/tests/test_controllers.py | 224 +++++++++++++++++++++++++++++++++++++++- 7 files changed, 321 insertions(+), 15 deletions(-) New commits: commit 738f0b74947c96512034277ca0844d35200f66cd Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 13:57:49 2010 -0500 Reset the PackageUpdate.date_pushed when a testing update hits stable diff --git a/bodhi/model.py b/bodhi/model.py index a05ca2d..6c93521 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -335,7 +335,6 @@ class PackageUpdate(SQLObject): time.localtime()[0],id) log.debug("Setting updateid for %s to %s" % (self.title, self.updateid)) - self.date_pushed = datetime.utcnow() hub.commit() def set_request(self, action, pathcheck=True): @@ -434,6 +433,7 @@ class PackageUpdate(SQLObject): self.pushed = True self.status = 'testing' self.assign_id() + self.date_pushed = datetime.utcnow() elif self.request == 'obsolete': self.pushed = False self.status = 'obsolete' @@ -441,6 +441,7 @@ class PackageUpdate(SQLObject): self.pushed = True self.status = 'stable' self.assign_id() + self.date_pushed = datetime.utcnow() self.request = None hub.commit() commit 06846118dd164e89ae747caaa6997a7718739cdb Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:22:48 2010 -0500 We want to move tags for *all* updates headed to stable for pending releases, not just critical path updates. diff --git a/bodhi/masher.py b/bodhi/masher.py index e648692..6ae1ee6 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -387,7 +387,7 @@ class MashTask(Thread): self.tag = update.release.stable_tag # [No Frozen Rawhide] Move stable builds going to a pending # release to the Release.dist-tag - if update.release.locked and update.critpath: + if update.release.locked: self.tag = update.release.dist_tag elif update.request == 'testing': self.tag = update.release.testing_tag commit 290ea5e58ef2a4ed5e7843e3d4aedc2ad69af067 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:21:15 2010 -0500 Minor comment tweaks diff --git a/bodhi/masher.py b/bodhi/masher.py index 1293e75..e648692 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -385,8 +385,8 @@ class MashTask(Thread): for update in self.updates: if update.request == 'stable': self.tag = update.release.stable_tag - # [No Frozen Rawhide] Move stable builds going to a locked - # release to the dist-tag + # [No Frozen Rawhide] Move stable builds going to a pending + # release to the Release.dist-tag if update.release.locked and update.critpath: self.tag = update.release.dist_tag elif update.request == 'testing': commit ceecc97ecbe7ee44ff664235c913ffb2bdd64bbb Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:20:33 2010 -0500 Minor comment addition diff --git a/bodhi/controllers.py b/bodhi/controllers.py index b2b0c9e..7b134e5 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -838,6 +838,7 @@ class Root(controllers.RootController): note.append("You're pushing a critical path package directly to " "stable, which is strongly discouraged. Please " "consider pushing to testing first!") + # Discourage devs from pushing directly to stable for pending releases elif update.request == 'stable' and update.release.locked: note.append("This update is bypassing updates-testing for a " "pending release, which is strongly discouraged. " commit bc06073d029f623ee73f90a38fb46491480fe39d Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:18:57 2010 -0500 Discourage developers from pushing critpath packages to stable, harder. diff --git a/bodhi/controllers.py b/bodhi/controllers.py index e7d9e7f..b2b0c9e 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -836,7 +836,8 @@ class Root(controllers.RootController): 'qa' not in identity.current.groups and 'releng' not in identity.current.groups): note.append("You're pushing a critical path package directly to " - "stable. Please consider pushing to testing first!") + "stable, which is strongly discouraged. Please " + "consider pushing to testing first!") elif update.request == 'stable' and update.release.locked: note.append("This update is bypassing updates-testing for a " "pending release, which is strongly discouraged. " commit dfdf1f57e82de781f6d604947b39dc609cb52571 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:17:11 2010 -0500 Strongly discourage devs from pushing directly to stable for pending releases diff --git a/bodhi/controllers.py b/bodhi/controllers.py index c3377b2..e7d9e7f 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -837,6 +837,11 @@ class Root(controllers.RootController): 'releng' not in identity.current.groups): note.append("You're pushing a critical path package directly to " "stable. Please consider pushing to testing first!") + elif update.request == 'stable' and update.release.locked: + note.append("This update is bypassing updates-testing for a " + "pending release, which is strongly discouraged. " + "Please ensure that it is properly tested, or " + "consider pushing it to testing first.") flash_log('. '.join(note)) commit f31e885836bdab3fbe806e0a8b5f10bf35056b4e Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:06:16 2010 -0500 Add a bunch of unit tests for the No Frozen Rawhide policy diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index 2228c0a..916d297 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -21,9 +21,9 @@ from bodhi.exceptions import DuplicateEntryError cherrypy.root = Root() -def create_release(num='7', dist='dist-fc'): +def create_release(num='7', dist='dist-fc', **kw): rel = Release(name='F'+num, long_name='Fedora '+num, id_prefix='FEDORA', - dist_tag=dist+num) + dist_tag=dist+num, **kw) assert rel assert Release.byName('F'+num) return rel @@ -1243,3 +1243,223 @@ class TestControllers(testutil.DBTest): assert False, "Old obsolete build still exists!!" except SQLObjectNotFound: pass + + def test_push_critpath_to_release(self): + session = login() + create_release() + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': 'stable', + 'unstable_karma' : -1, + } + testutil.capture_log(["bodhi.util", "bodhi.controllers", "bodhi.model"]) + self.save_update(params, session) + log = testutil.get_log() + assert "Update successfully created. You're pushing a critical path package directly to stable. Please consider pushing to testing first!" in log, log + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'stable' + + def test_push_critpath_to_frozen_release(self): + session = login() + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': 'stable', + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'testing' + + def test_push_critpath_to_frozen_release_and_request_stable(self): + session = login() + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': 'stable', + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'testing' + + # Ensure we can't create a stable request + testutil.capture_log(["bodhi.util", "bodhi.controllers", "bodhi.model"]) + testutil.create_request('/updates/request/stable/%s' % params['builds'], + method='POST', headers=session) + log = testutil.get_log() + assert "Forcing critical path update into testing" in log + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'testing' + + def test_push_critpath_to_frozen_release_and_request_stable_as_releng(self): + session = login(group='releng') + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': 'stable', + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'stable' + + def test_critpath_to_frozen_release_available_actions(self): + """ + Ensure devs can attempt to push critpath updates for pending releases + to stable, but make sure that it can only go to testing. + """ + session = login() + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + + assert "Push to Testing" in cherrypy.response.body[0] + assert "Push to Stable" not in cherrypy.response.body[0] + + testutil.create_request('/updates/request/stable/%s' % params['builds'], + method='POST', headers=session) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'testing' + + def test_critpath_to_frozen_release_available_actions_for_releng(self): + """ + Ensure releng/qa can push critpath updates to stable for pending releases + """ + session = login(group='releng') + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + + assert "Push to Testing" in cherrypy.response.body[0] + assert "Push Critical Path update to Stable" in cherrypy.response.body[0] + + def test_critpath_to_frozen_release_testing(self): + """ + Ensure devs can *not* push critpath updates directly to stable + for pending releases + """ + session = login() + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + + # Pretend it's pushed to testing + update.pushed = True + update.status = 'testing' + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + + # Ensure the dev cannot push it to stable + assert "/updates/request/stable" not in cherrypy.response.body[0] + + def test_non_critpath_to_frozen_release_testing(self): + """ + Ensure non-critpath packages can still be pushed to stable as usual + """ + session = login() + create_release(locked=True) + params = { + 'builds' : 'nethack-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + + # Pretend it's pushed to testing + update.pushed = True + update.status = 'testing' + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + + assert "/updates/request/stable" in cherrypy.response.body[0] + + def test_critpath_to_frozen_release_testing_admin_actions(self): + """ + Ensure admins can submit critpath updates for pending releases to stable. + """ + session = login(group='qa') + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + + # Pretend it's pushed to testing + update.pushed = True + update.status = 'testing' + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + + assert "Mark Critical Path update as Stable" in cherrypy.response.body[0] commit 4008b9c7354b13c96d3e9be93bf09b285573fab6 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:05:59 2010 -0500 Tweak our update action links for the No Frozen Rawhide policy diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid index ea01bef..8e7c8af 100644 --- a/bodhi/templates/show.kid +++ b/bodhi/templates/show.kid @@ -67,12 +67,24 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k Push to Testing </a> </td> + + + <td> + <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> + <img src="${tg.url('/static/images/submit.png')}" border="0"/> + Push Critical Path update to Stable + </a> + </td> + + <td> <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/submit.png')}" border="0"/> Push to Stable </a> </td> + + <td> <a href="${util.url('/confirm_delete?nvr=%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/trash.png')}" border="0"/> @@ -95,14 +107,26 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k </a> </td> - - <td> - <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> - <img src="${tg.url('/static/images/submit.png')}" border="0"/> - Mark as Stable - </a> - </td> - + + + + <td> + <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> + <img src="${tg.url('/static/images/submit.png')}" border="0"/> + Mark Critical Path update as Stable + </a> + </td> + + + + <td> + <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> + <img src="${tg.url('/static/images/submit.png')}" border="0"/> + Mark as Stable + </a> + </td> + + <td> <a href="${util.url('/edit/%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/edit.png')}" border="0"/> commit 835598ced5d3ba0112d8dbdd684af9d4d7de775a Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:05:45 2010 -0500 Add a PackageUpdate.critpath property diff --git a/bodhi/model.py b/bodhi/model.py index 17c41e9..a05ca2d 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -825,6 +825,17 @@ class PackageUpdate(SQLObject): return None return int(self.updateid.split('-')[-1]) + @property + def critpath(self): + """ Return whether or not this update is in the critical path """ + critical = False + critpath_pkgs = config.get('critpath').split() + for build in self.builds: + if build.package.name in critpath_pkgs: + critical = True + break + return critical + class Comment(SQLObject): timestamp = DateTimeCol(default=datetime.utcnow) commit 547ea42ba8c32ae261ce4c1b2cb231e284aafab8 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:05:28 2010 -0500 [No Frozen Rawhide] Disable pushing critical path updates for pending releases directly to stable. diff --git a/bodhi/model.py b/bodhi/model.py index f55ff3b..17c41e9 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -407,6 +407,17 @@ class PackageUpdate(SQLObject): flash_log('%s does not have a request to revoke' % self.title) return + # [No Frozen Rawhide] Disable pushing critical path updates for + # pending releases directly to stable. + if action == 'stable' and self.release.locked and self.critpath: + if ('releng' in identity.current.groups or + 'qa' in identity.current.groups): + self.comment('Critical path update approved by %s' % + identity.current.user_name, author='bodhi') + else: + log.info('Forcing critical path update into testing') + action = 'testing' + self.request = action self.pushed = False #self.date_pushed = None commit 41c407e5a73dfcaa9077eb2babd8301911d10a78 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:05:17 2010 -0500 [No Frozen Rawhide] We're going to re-use this column to flag 'pending' releases, since we'll no longer need to lock releases in this case. diff --git a/bodhi/model.py b/bodhi/model.py index 819b571..f55ff3b 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -50,9 +50,12 @@ class Release(SQLObject): updates = MultipleJoin('PackageUpdate', joinColumn='release_id') id_prefix = UnicodeCol(notNone=True) dist_tag = UnicodeCol(notNone=True) # ie dist-fc7 - locked = BoolCol(default=False) metrics = PickleCol(default=None) # {metric: {data}} + # [No Frozen Rawhide] We're going to re-use this column to flag 'pending' + # releases, since we'll no longer need to lock releases in this case. + locked = BoolCol(default=False) + def get_version(self): regex = re.compile('\D+(\d+)$') return int(regex.match(self.name).groups()[0]) commit 63b8f7dc67e08da4c539a0a2bf36e3ae2526bf5b Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:05:04 2010 -0500 [No Frozen Rawhide] Move stable builds going to a locked release to the dist-tag diff --git a/bodhi/masher.py b/bodhi/masher.py index 6464d73..1293e75 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -385,6 +385,10 @@ class MashTask(Thread): for update in self.updates: if update.request == 'stable': self.tag = update.release.stable_tag + # [No Frozen Rawhide] Move stable builds going to a locked + # release to the dist-tag + if update.release.locked and update.critpath: + self.tag = update.release.dist_tag elif update.request == 'testing': self.tag = update.release.testing_tag elif update.request == 'obsolete': commit 5fd95a684f0a7dd8a271b7a7df198356bf804069 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:04:55 2010 -0500 [No Frozen Rawhide] Don't mash stable repos for pending releases diff --git a/bodhi/masher.py b/bodhi/masher.py index c890d92..6464d73 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -351,6 +351,11 @@ class MashTask(Thread): """ for update in self.updates: release = update.release + + # [No Frozen Rawhide] Don't mash stable repos for pending releases + if update.request == 'stable' and release.locked: + continue + if self.resume: self.repos.add(release.stable_repo) self.repos.add(release.testing_repo) commit 54b18e535a19a5cf9b11d0a2dd49ffd0cc934a09 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:04:44 2010 -0500 Politely discourage devs from pushing critpath straight to stable diff --git a/bodhi/controllers.py b/bodhi/controllers.py index fa2e7e1..c3377b2 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -831,6 +831,13 @@ class Root(controllers.RootController): flash_log(str(e)) raise InvalidUpdateException(params) + # Politely discourage devs from pushing critpath straight to stable + if (update.request == 'stable' and update.critpath and + 'qa' not in identity.current.groups and + 'releng' not in identity.current.groups): + note.append("You're pushing a critical path package directly to " + "stable. Please consider pushing to testing first!") + flash_log('. '.join(note)) if request_format() == 'json': commit 1e486d8d35495d46523e1f1ec805ecbad0b57764 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:04:28 2010 -0500 Hardcode the critpath package list until we can query the pkgdb for it diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg index 0cf1843..2c94f87 100644 --- a/bodhi/config/app.cfg +++ b/bodhi/config/app.cfg @@ -148,6 +148,14 @@ tgcaptcha.jpeg_generator = 'mcdermott' tgcaptcha.key = 'Y`h`f&s}TZz' #tgcaptcha.controller = '/updates/captcha' +## +## Critical Path Packages +## +## Hardcoded, until we can query the pkgdb for it. +## http://kojipkgs.fedoraproject.org/mash/rawhide-20100107/logs/critpath.txt +critpath = "ConsoleKit ConsoleKit-libs ConsoleKit-x11 DeviceKit-power GConf2 GConf2-gtk MAKEDEV ModemManager NetworkManager NetworkManager-glib ORBit2 acl alsa-lib anaconda anaconda-yum-plugins at-spi atk attr audit audit-libs authconfig authconfig-gtk avahi avahi-autoipd avahi-glib basesystem bash binutils bluecurve-cursor-theme bzip2 bzip2-libs c-ares ca-certificates cairo checkpolicy chkconfig cloog-ppl compat-db47 comps-extras constantine-backgrounds constantine-backgrounds-single control-center control-center-filesystem coreutils coreutils-libs cpio cpp cracklib cracklib-dicts cracklib-python createrepo cronie cronie-anacron crontabs cryptsetup-luks cryptsetup-luks-libs cups-libs curl cyrus-sasl cyrus-sasl-lib dash db4 db4-utils dbus dbus-glib dbus-libs dbus-python dbus-x11 deltarpm desktop-backgrounds-basic desktop-file-utils device-mapper device-mapper-event device-mapper-event-libs device-mapper-libs dhclient diffutils dmidecode dmraid dmraid-events dnsmasq dosfstools dracut e2fsprogs e2fsprogs-libs efibootmgr eggdbus elfutils elfutils-libelf elfutils-libs ethtool evolution-data-server expat fedora-gnome-theme fedora-icon-theme fedora-logos fedora-release fedora-setup-keyboard file file-libs filesystem findutils fipscheck fipscheck-lib firstboot flac fontconfig freetype gamin gawk gcc gcc-c++ gdbm gdm genisoimage glib2 glibc glibc-common glibc-devel glibc-headers gmp gnome-desktop gnome-icon-theme gnome-keyring gnome-keyring-pam gnome-menus gnome-panel-libs gnome-python2 gnome-python2-canvas gnome-python2-gnome gnome-python2-gnomevfs gnome-session gnome-settings-daemon gnome-themes gnome-vfs2 gnupg2 gnutls gpgme grep grub grubby gstreamer gstreamer-tools gtk2 gtk2-engines gzip hal hal-info hal-libs hdparm hesiod hicolor-icon-theme hostname hwdata info initscripts iptables iptables-ipv6 iputils iscsi-initiator-utils iso-codes isomd5sum jasper-libs kbd kernel kernel-headers keyutils-libs koji kpartx krb5-libs less libICE libIDL libSM libX11 libX11-common libXScrnSaver libXau libXcomposite libXcursor libXdamage libXdmcp libXext libXfixes libXfont libXft libXi libXinerama libXmu libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86misc libXxf86vm libacl libart_lgpl libasyncns libattr libblkid libbonobo libbonoboui libcanberra libcanberra-gtk2 libcap libcap-ng libcom_err libcroco libcurl libdaemon libdrm libedit libffi libfontenc libgail-gnome libgcc libgcrypt libglade2 libgnome libgnomecanvas libgnomekbd libgnomeui libgomp libgpg-error libgsf libgudev1 libgweather libical libidn libjpeg libmcpp libnl libnotify libogg libpcap libpciaccess libpng libproxy libproxy-bin libproxy-python librsvg2 libselinux libselinux-python libselinux-utils libsemanage libsepol libsndfile libsoup libss libssh2 libstdc++ libstdc++-devel libtasn1 libtdb libthai libtiff libtool-ltdl libudev libusb libuser libuser-python libutempter libuuid libvorbis libwnck libx86 libxcb libxkbfile libxklavier libxml2 libxml2-python libxslt linux-firmware livecd-tools logrotate lua lvm2 lvm2-libs lzma lzma-libs m4 makebootfat mash mcpp mdadm metacity mingetty mobile-broadband-provider-info module-init-tools mpfr mtools mysql-libs nash ncurses ncurses-base ncurses-libs net-tools newt newt-python notification-daemon notification-daemon-engine-slider nspr nss nss-softokn nss-softokn-freebl nss-sysinit nss-util ntp ntpdate openldap openssh openssh-clients openssh-server openssl pam pango parted passwd patch pciutils-libs pcre perl perl-Crypt-PasswdMD5 perl-Digest-SHA1 perl-Module-Pluggable perl-Pod-Escapes perl-Pod-Simple perl-libs perl-version pinentry pixman pkgconfig plymouth plymouth-gdm-hooks plymouth-libs plymouth-scripts plymouth-utils pm-utils policycoreutils polkit polkit-desktop-policy polkit-gnome popt postfix ppl ppp procmail procps psmisc pth pulseaudio-gdm-hooks pulseaudio-libs pulseaudio-libs-glib2 pungi pyOpenSSL pycairo pygobject2 pygpgme pygtk2 pygtk2-libglade pykickstart pyparted python python-bugzilla python-cryptsetup python-decorator python-deltarpm python-ethtool python-imgcreate python-iniparse python-kid python-krbV python-libs python-meh python-nss python-pyblock python-pycurl python-slip python-urlgrabber pyxf86config radeontool rarian rarian-compat readline redhat-menus redhat-rpm-config repoview rootfiles rpm rpm-build rpm-libs rpm-python rsyslog sed selinux-policy selinux-policy-targeted sendmail setserial setup setuptool sgml-common sgpio shadow-utils shared-mime-info slang sound-theme-freedesktop sqlite squashfs-tools startup-notification sudo sysklogd syslinux system-config-date system-config-firewall-base system-config-keyboard system-config-users sysvinit-tools tar tcp_wrappers-libs tzdata udev unique unzip upstart usermode usermode-gtk ustr util-linux-ng vbetool vim-minimal which wpa_supplicant xcb-util xdg-utils xkeyboard-config xml-common xorg-x11-drivers xorg-x11-drv-acecad xorg-x11-drv-aiptek xorg-x11-drv-apm xorg-x11-drv-ast xorg-x11-drv-ati xorg-x11-drv-cirrus xorg-x11-drv-dummy xorg-x11-drv-elographics xorg-x11-drv-evdev xorg-x11-drv-fbdev xorg-x11-drv-fpit xorg-x11-drv-geode xorg-x11-drv-glint xorg-x11-drv-hyperpen xorg-x11-drv-i128 xorg-x11-drv-i740 xorg-x11-drv-intel xorg-x11-drv-keyboard xorg-x11-drv-mach64 xorg-x11-drv-mga xorg-x11-drv-mouse xorg-x11-drv-mutouch xorg-x11-drv-neomagic xorg-x11-drv-nouveau xorg-x11-drv-nv xorg-x11-drv-openchrome xorg-x11-drv-penmount xorg-x11-drv-r128 xorg-x11-drv-rendition xorg-x11-drv-s3virge xorg-x11-drv-savage xorg-x11-drv-siliconmotion xorg-x11-drv-sis xorg-x11-drv-sisusb xorg-x11-drv-synaptics xorg-x11-drv-tdfx xorg-x11-drv-trident xorg-x11-drv-v4l xorg-x11-drv-vesa xorg-x11-drv-vmmouse xorg-x11-drv-vmware xorg-x11-drv-void xorg-x11-drv-voodoo xorg-x11-drv-wacom xorg-x11-server-Xorg xorg-x11-server-common xorg-x11-server-utils xorg-x11-xauth xorg-x11-xinit xorg-x11-xkb-utils xz xz-libs yum yum-metadata-parser yum-utils zenity zlib" + + # The commented out values below are the defaults # VIEW commit dbb609c91b1f35cf07eaebd22aa795596c2b95e0 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:04:12 2010 -0500 Don't hide locked releases anymore diff --git a/bodhi/admin.py b/bodhi/admin.py index db096dd..7d80d25 100644 --- a/bodhi/admin.py +++ b/bodhi/admin.py @@ -110,9 +110,14 @@ class AdminController(Controller, SecureResource): else: # Get a list of all updates with a request that aren't # unapproved security updates, or for a locked release - requests = filter(lambda update: not update.release.locked, - PackageUpdate.select( - PackageUpdate.q.request != None)) + requests = PackageUpdate.select(PackageUpdate.q.request != None) + + # Come F13+, bodhi will not have locked releases. It will + # implement the 'No Frozen Rawhide' proposal, and treat 'locked' + # releases as pending. + #requests = filter(lambda update: not update.release.locked, + # PackageUpdate.select( + # PackageUpdate.q.request != None)) for update in requests: if update.type == 'security' and not update.approved: continue

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

bodhi January 2010