-
Notifications
You must be signed in to change notification settings - Fork 190
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[WIP] Add script and tests for moving a batched request to a stable request #1678
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1731,8 +1731,8 @@ def set_request(self, db, action, username): | |
|
||
# If status is testing going to stable request and action is revoke, | ||
# keep the status at testing | ||
elif self.status is UpdateStatus.testing and self.request is UpdateRequest.stable \ | ||
and action is UpdateRequest.revoke: | ||
elif self.request in (UpdateRequest.stable, UpdateRequest.batched) and \ | ||
self.status is UpdateStatus.testing and action is UpdateRequest.revoke: | ||
self.status = UpdateStatus.testing | ||
self.revoke() | ||
flash_log("%s has been revoked." % self.title) | ||
|
@@ -1748,7 +1748,7 @@ def set_request(self, db, action, username): | |
return | ||
|
||
# Disable pushing critical path updates for pending releases directly to stable | ||
if action is UpdateRequest.stable and self.critpath: | ||
if action in (UpdateRequest.stable, UpdateRequest.batched) and self.critpath: | ||
if config.get('critpath.num_admin_approvals') is not None: | ||
if not self.critpath_approved: | ||
stern_note = ( | ||
|
@@ -1774,7 +1774,7 @@ def set_request(self, db, action, username): | |
|
||
# Ensure this update meets the minimum testing requirements | ||
flash_notes = '' | ||
if action is UpdateRequest.stable and not self.critpath: | ||
if action in (UpdateRequest.stable, UpdateRequest.batched) and not self.critpath: | ||
# Check if we've met the karma requirements | ||
if (self.stable_karma not in (None, 0) and self.karma >= | ||
self.stable_karma) or self.critpath_approved: | ||
|
@@ -2373,9 +2373,14 @@ def check_karma_thresholds(self, db, agent): | |
self.comment(db, text, author=u'bodhi') | ||
elif self.stable_karma and self.karma >= self.stable_karma: | ||
if self.autokarma: | ||
log.info("Automatically marking %s as stable" % self.title) | ||
self.set_request(db, UpdateRequest.stable, agent) | ||
self.request = UpdateRequest.stable | ||
if self.severity is UpdateSeverity.urgent or self.type is UpdateType.newpackage: | ||
log.info("Automatically marking %s as stable" % self.title) | ||
self.set_request(db, UpdateRequest.stable, agent) | ||
else: | ||
log.info("Automatically adding %s to batch of updates that will be pushed to" | ||
" stable at a later date" % self.title) | ||
self.set_request(db, UpdateRequest.batched, agent) | ||
|
||
self.date_pushed = None | ||
notifications.publish( | ||
topic='update.karma.threshold.reach', | ||
|
@@ -2571,7 +2576,7 @@ def requested_tag(self): | |
# release to the Release.dist-tag | ||
if self.release.state is ReleaseState.pending: | ||
tag = self.release.dist_tag | ||
elif self.request is UpdateRequest.testing: | ||
elif self.request in (UpdateRequest.testing, UpdateRequest.batched): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. (I made this comment on the fedora devel list and was told to post it here). It would be nice if new package updates were also sent directly to stable with something like There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this suggestion makes sense. @crungehottman, if you can add one more if statement and one more test for new packages, that would be great! |
||
tag = self.release.testing_tag | ||
elif self.request is UpdateRequest.obsolete: | ||
tag = self.release.candidate_tag | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
# -*- coding: utf-8 -*- | ||
# Copyright © 2017 Caleigh Runge-Hottman | ||
# | ||
# This file is part of Bodhi. | ||
# | ||
# This program is free software; you can redistribute it and/or | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's add a Copyright claim here. Only, I'm not quite sure who to put as the Copyright holder. I started a thread on outreachy-list to ask. If you are on that list, perhaps you can use their feedback to know what to do here. Anyways, once we know who or what organization to give the Copyright to, let's do something like this here:
and then the rest of the header like you have it here. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. According to Tony Sebro, you get to hold the copyright on this code (neat, huh? In most places, your employer would hold the copyright on code that you are paid to write so that's pretty cool I think). So you should do this in this file and the test file you wrote:
|
||
# modify it under the terms of the GNU General Public License | ||
# as published by the Free Software Foundation; either version 2 | ||
# of the License, or (at your option) any later version. | ||
# | ||
# This program is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with this program; if not, write to the Free Software | ||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
"""This script is responsible for moving all updates with a batched request to a stable request.""" | ||
|
||
import sys | ||
|
||
import click | ||
|
||
from bodhi.server import buildsys, config, models, Session, initialize_db | ||
|
||
|
||
@click.command() | ||
@click.version_option(message='%(version)s') | ||
def dequeue_stable(): | ||
"""Convert all batched requests to stable requests.""" | ||
initialize_db(config.config) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We also need to initialize the buildsys here, otherwise the script gets an error:
Here's a patch that sets up the buildsys and also sets up the console script entry point:
With that patch I was able to see an update get to batched by me giving it karma, and then I was able to see it get to stable with the script. Very cool! |
||
buildsys.setup_buildsystem(config.config) | ||
db = Session() | ||
|
||
try: | ||
batched = db.query(models.Update).filter_by(request=models.UpdateRequest.batched).all() | ||
for update in batched: | ||
update.set_request(db, models.UpdateRequest.stable, u'bodhi') | ||
db.commit() | ||
|
||
except Exception as e: | ||
print(str(e)) | ||
db.rollback() | ||
Session.remove() | ||
sys.exit(1) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a fine way to do it, but I'll mention that we also have a
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
# -*- coding: utf-8 -*- | ||
# Copyright © 2017 Caleigh Runge-Hottman | ||
# | ||
# This file is part of Bodhi. | ||
# | ||
# This program is free software; you can redistribute it and/or | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similarly, let's put a Copyright claim here. |
||
# modify it under the terms of the GNU General Public License | ||
# as published by the Free Software Foundation; either version 2 | ||
# of the License, or (at your option) any later version. | ||
# | ||
# This program is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with this program; if not, write to the Free Software | ||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
""" | ||
This module contains tests for the bodhi.server.scripts.dequeue_stable module. | ||
""" | ||
from datetime import datetime, timedelta | ||
|
||
from click import testing | ||
|
||
from bodhi.server import models | ||
from bodhi.server.scripts import dequeue_stable | ||
from bodhi.tests.server.base import BaseTestCase | ||
|
||
|
||
class TestDequeueStable(BaseTestCase): | ||
""" | ||
This class contains tests for the dequeue_stable() function. | ||
""" | ||
def test_dequeue_stable(self): | ||
""" | ||
Assert that dequeue_stable moves only the batched updates to stable. | ||
""" | ||
runner = testing.CliRunner() | ||
|
||
update = self.db.query(models.Update).all()[0] | ||
update.request = models.UpdateRequest.batched | ||
update.locked = False | ||
update.date_testing = datetime.utcnow() - timedelta(days=7) | ||
self.db.commit() | ||
|
||
result = runner.invoke(dequeue_stable.dequeue_stable, []) | ||
self.assertEqual(result.exit_code, 0) | ||
|
||
update = self.db.query(models.Update).all()[0] | ||
self.assertEqual(update.request, models.UpdateRequest.stable) | ||
|
||
def test_dequeue_stable_exception(self): | ||
""" | ||
Assert that a locked update triggers an exception, and doesn't move to stable. | ||
""" | ||
runner = testing.CliRunner() | ||
update = self.db.query(models.Update).all()[0] | ||
update.request = models.UpdateRequest.batched | ||
self.db.commit() | ||
|
||
result = runner.invoke(dequeue_stable.dequeue_stable, []) | ||
|
||
self.assertEqual(result.exit_code, 1) | ||
self.assertEqual(result.output, u"Can't change the request on a locked update\n") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Excellent, I think this addresses the feedback from the devel list.