PR#261: Post discussion link to bz on propose - fedora-qa/blockerbugs

fedora-qa / blockerbugs

#261 Post discussion link to bz on propose

Opened 8 months ago by frantisekz. Modified 4 months ago

discussion_link_bz into develop

Post discussion link to bz on propose

František Zatloukal • 4 months ago

3c35669

blockerbugs/controllers/main.py

file modified

+16 -2

		`@@ -26,8 +26,8 @@`
		`import json`
		`import itertools`

		`- from blockerbugs import app, __version__`
		`- from blockerbugs.util import bz_interface, pagure_bot, misc`
		`+ from blockerbugs import app, db, __version__`
		`+ from blockerbugs.util import bz_interface, pagure_bot, misc, discussion_sync, bug_sync`
		`from blockerbugs.models.bug import Bug`
		`from blockerbugs.models.milestone import Milestone`
		`from blockerbugs.models.update import Update`
		`@@ -422,6 +422,19 @@`

		`return bz_interface.create_bugzilla()`

		`+ def bugzilla_crosspost(bugid, milestone, blocker, fe):`
		`+ # Fetch the proposed stuff into the database right away`
		`+ sync = bug_sync.BugSync(db)`
		`+ trackers_str = []`
		`+ if blocker: trackers_str.append("Blocker")`
		`+ if fe: trackers_str.append("FreezeException")`
		`+ sync.fetch_single_bug(milestone, bugid, trackers_str)`
		`+`
		`+ # Create a discussion ticket`
		`+ discussion_sync.create_discussions_links(milestone, [misc.bug_from_db(bugid, milestone)])`
		`+`
		`+ # Cross-comment the voting ticket link to the bugzilla`
		`+ bz_interface.comment_bz(misc.bug_from_db(bugid, milestone))`

		`@main.route('/propose_bug', methods=['GET', 'POST'])`
		`@fas_login_required`
		`@@ -479,6 +492,7 @@`
		`user, bugid, proposal.get_tracker_type(), selected_milestone.name))`
		`try:`
		`proposal.propose_bugs(user, selected_milestone.name, bugform.justification.data)`
		`+ bugzilla_crosspost(bugid, selected_milestone, bool(bugform.blocker.data), bool(bugform.freeze_exception.data))`
		`return render_template('thanks.html', bugid=bugid,`
		`isblocker=bugform.blocker.data,`
		`isfe=bugform.freeze_exception.data,`

blockerbugs/util/bug_sync.py

file modified

+16

		`@@ -150,6 +150,22 @@`

		`self.db.session.commit()`

		`+ def fetch_single_bug(self, milestone: Milestone, bugid, trackers) -> None:`
		`+ self.log.info("Fetching bug data for %s" % bugid)`
		`+ bug = self.bzinterface.bz.getbug(bugid)`
		`+ oldbug = Bug.query.filter_by(bugid=bug.bug_id, milestone=milestone).first()`
		`+`
		`+ for tracker in trackers:`
		`+ buginfo = self.extract_information(bug, tracker)`
		`+ if oldbug:`
		`+ oldbug.update(buginfo, tracker, milestone)`
		`+ self.db.session.add(oldbug)`
		`+ else:`
		`+ newbug = Bug.from_data(buginfo, milestone, tracker)`
		`+ self.db.session.add(newbug)`
		`+`
		`+ self.db.session.commit()`
		`+`
		`def cleanup_milestone(self, milestone: Milestone, tracker_type: str) -> None:`
		"""'Clean up' all bugs under `tracker_type` in `milestone`, which are not currently blocking
		`the relevant tracker ticket. Cleaning up means setting all those bugs as rejected`

blockerbugs/util/bz_interface.py

file modified

		`@@ -67,6 +67,12 @@`
		`url = '{uri.scheme}://{uri.netloc}'.format(uri=parsed_uri)`
		`return url`

		`+ def comment_bz(bug):`
		`+ bz = create_bugzilla()`
		`+ comment = ["You can vote if this should be accepted as a Blocker and/or FreezeException",`
		`+ " for", bug.milestone.name, " on: " , bug.discussion_link]`
		`+ bug_update = bz.build_update(comment=' '.join(comment))`
		`+ bz.update_bugs(bug.bugid, bug_update)`

		`class BZInterfaceError(Exception):`
		`"""A custom wrapper for XMLRPC errors from Bugzilla"""`

blockerbugs/util/discussion_sync.py

file modified

+2 -1

		`@@ -2,7 +2,7 @@`

		`from blockerbugs import db, app`
		`from blockerbugs.config import Config as bb_Config`
		`- from blockerbugs.util import pagure_interface`
		`+ from blockerbugs.util import pagure_interface, bz_interface`
		`from blockerbugs.models.milestone import Milestone`
		`from blockerbugs.models.release import Release`
		`from blockerbugs.models.bug import Bug`
		`@@ -77,6 +77,7 @@`
		`for milestone in milestones:`
		`bugs = Bug.query.filter_by(bugid=bugid, milestone=milestone).all()`
		`create_discussions_links(milestone, bugs)`
		`+ bz_interface.comment_bz(bugs[0])`


		`def close_discussions_inactive_releases(dry_run=False):`

blockerbugs/util/misc.py

file modified

+4 -1

		`@@ -3,7 +3,7 @@`
		`from typing import Optional`

		`from blockerbugs import _version`
		`-`
		`+ from blockerbugs.models.bug import Bug`

		`def version_date() -> Optional[str]:`
		`"""Return the date (just the date portion) of the app version identifier, as returned by`
		`@@ -15,3 +15,6 @@`
		`parts = date.split(sep='T')`
		`assert len(parts) == 2`
		`return parts[0]`
		`+`
		`+ def bug_from_db(bugid, milestone):`
		`+ return Bug.query.filter_by(bugid=bugid, milestone=milestone).first()`

frantisekz commented 8 months ago

Fixes #148

Apart from that, it causes the proposed bugs to appear immediately in the blockerbugs app, without needing to wait up to 30 minutes for the next sync. Slightly increases time that it takes to process proposals.

rebased onto fb94f96

8 months ago

rebased onto 64a5246

8 months ago

zuul commented 8 months ago

Build succeeded.

blockerbugs-pytest : SUCCESS in 2m 25s

rebased onto 1f49468

8 months ago

zuul commented 8 months ago

Build succeeded.

blockerbugs-pytest : SUCCESS in 2m 12s

lbrabec commented 8 months ago

You should probably also handle situation when someone re-creates a discussion: https://pagure.io/fedora-qa/blockerbugs/blob/develop/f/blockerbugs/cli.py#_217

zuul commented 8 months ago

Build succeeded.

blockerbugs-pytest : SUCCESS in 2m 10s

rebased onto f3ef31f

8 months ago

zuul commented 8 months ago

Build succeeded.

blockerbugs-pytest : SUCCESS in 2m 17s

rebased onto 7bc8d08

8 months ago

rebased onto 6ceb861

8 months ago

zuul commented 8 months ago

Build succeeded.

blockerbugs-pytest : SUCCESS in 2m 08s

zuul commented 8 months ago

Build succeeded.

blockerbugs-pytest : SUCCESS in 2m 05s

rebased onto 798ad06

4 months ago

zuul commented 4 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/71e7ac2725b34c6387961a54ffce0202

blockerbugs-pytest : SUCCESS in 4m 24s

rebased onto 3c35669

4 months ago

frantisekz commented 4 months ago

@kparal This is now ready for review (note: I am yet to test this code after the recent refactoring, t should(tm) work).

One question comes to mind right now, where should bugzilla_crosspost be placed? It's currently in controllers.main which doesn't "feel right", do you have some ideas/opinions?

zuul commented 4 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/6c50eae00f75402a908b5aec92b76395