Changeset 255218 in webkit

Timestamp:

Jan 27, 2020 5:46:47 PM (4 years ago)

Author:

aakash_jain@apple.com

Message:

[ews] Add method to fetch cq+ patches from Bugzilla
​https://bugs.webkit.org/show_bug.cgi?id=206774

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-app/ews/common/bugzilla.py:

(Bugzilla._get_commit_queue_patches_from_bug): Method to get cq+ patches for a given bug.
(Bugzilla._is_patch_cq_plus): Method to check if patch has cq+ flag set.
(Bugzilla.get_list_of_patches_for_commit_queue): Method to fetch list of cq+ patches from Bugzilla.
(BugzillaBeautifulSoup.fetch_bug_ids_for_commit_queue):

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-app/ews/common/bugzilla.py (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py

@@ -75 +75 @@
 
     @classmethod
+    def _get_commit_queue_patches_from_bug(cls, bug_id):
+        if not util.is_valid_id(bug_id):
+            _log.warn('Invalid bug id: "{}"'.format(bug_id))
+            return []
+
+        bug_url = '{}rest/bug/{}/attachment'.format(config.BUG_SERVER_URL, bug_id)
+        api_key = os.getenv('BUGZILLA_API_KEY', None)
+        if api_key:
+            bug_url += '?api_key={}'.format(api_key)
+        bug = util.fetch_data_from_url(bug_url)
+        if not bug:
+            return []
+        bug_json = bug.json().get('bugs')
+        if not bug_json or len(bug_json) == 0:
+            return []
+
+        commit_queue_patches = []
+        for patch_json in bug_json.get(str(bug_id)):
+            if cls._is_patch_cq_plus(patch_json) == 1:
+                commit_queue_patches.append(patch_json.get('id'))
+
+        return commit_queue_patches
+
+    @classmethod
+    def _is_patch_cq_plus(cls, patch_json):
+        if not patch_json:
+            return -1
+
+        for flag in patch_json.get('flags', []):
+            if flag.get('name') == 'commit-queue' and flag.get('status') == '+':
+                return 1
+        return 0
+
+    @classmethod
     def file_path_for_patch(cls, patch_id):
         if not os.path.exists(config.PATCH_FOLDER):
@@ -86 +120 @@
         #TODO: add security bugs support here.
         return ids_needing_review
+
+    @classmethod
+    def get_list_of_patches_for_commit_queue(cls):
+        bug_ids_for_commit_queue = set(BugzillaBeautifulSoup().fetch_bug_ids_for_commit_queue())
+        ids_for_commit_queue = []
+        for bug_id in bug_ids_for_commit_queue:
+            ids_for_commit_queue.extend(cls._get_commit_queue_patches_from_bug(bug_id))
+        return ids_for_commit_queue
 
 
@@ -144 +186 @@
         return self._parse_attachment_ids_request_query(self._load_query(review_queue_url), since)
 
+    def fetch_bug_ids_for_commit_queue(self):
+        commit_queue_url = "buglist.cgi?query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&field0-0-0=flagtypes.name&type0-0-0=equals&value0-0-0=commit-queue%2B&order=Last+Changed"
+        soup = BeautifulSoup(self._load_query(commit_queue_url))
+        # The contents of the <a> inside the cells in the first column happen
+        # to be the bug id.
+        return [int(bug_link_cell.find("a").string)
+                for bug_link_cell in soup('td', "first-child")]
+
     def _load_query(self, query):
         self.authenticate()

trunk/Tools/ChangeLog

@@ +1 @@
+2020-01-27  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews] Add method to fetch cq+ patches from Bugzilla
+        https://bugs.webkit.org/show_bug.cgi?id=206774
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-app/ews/common/bugzilla.py:
+        (Bugzilla._get_commit_queue_patches_from_bug): Method to get cq+ patches for a given bug.
+        (Bugzilla._is_patch_cq_plus): Method to check if patch has cq+ flag set.
+        (Bugzilla.get_list_of_patches_for_commit_queue): Method to fetch list of cq+ patches from Bugzilla.
+        (BugzillaBeautifulSoup.fetch_bug_ids_for_commit_queue):
+
 2020-01-27  Noam Rosenthal  <noam@webkit.org>