Skip to content

Commit

Permalink
Fix error when PR number is None in DetermineLabelOwner
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=261527
rdar://115447713

Reviewed by Jonathan Bedard and Aakash Jain.

Updated property name and added error handling for empty PR numbers.

Canonical link: https://commits.webkit.org/267966@main
  • Loading branch information
briannafan authored and JonWBedard committed Sep 13, 2023
1 parent 9946be5 commit 7974477
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
9 changes: 7 additions & 2 deletions Tools/CISupport/ews-build/steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -2042,14 +2042,19 @@ class DetermineLabelOwner(buildstep.BuildStep, GitHubMixin, AddToLogMixin):
@defer.inlineCallbacks
def run(self):
builder_name = self.getProperty('buildername', '')
pr_number = self.getProperty('pr_number', '')
pr_number = self.getProperty('github.number', '')
self.setProperty('pr_number', pr_number)
if builder_name == 'Safe-Merge-Queue':
list_of_prs = self.getProperty('list_of_prs', [])
pr_number = list_of_prs.pop()
self.setProperty('pr_number', pr_number)
self.setProperty('list_of_prs', list_of_prs)

query_body = '{ repository(owner:"Webkit", name:"WebKit") { pullRequest(number: %s) {timelineItems(itemTypes: LABELED_EVENT, last: 5) {nodes {... on LabeledEvent {actor { login } label { name } createdAt } } } } } }' % pr_number
if not pr_number:
yield self._addToLog('stdio', 'Unable to fetch PR number.\n')
return defer.returnValue(FAILURE)

query_body = '{repository(owner:"Webkit", name:"WebKit") { pullRequest(number: %s) {timelineItems(itemTypes: LABELED_EVENT, last: 5) {nodes {... on LabeledEvent {actor { login } label { name } createdAt } } } } } }' % pr_number
query = {'query': query_body}

response = yield self.query_graph_ql(query)
Expand Down
4 changes: 2 additions & 2 deletions Tools/CISupport/ews-build/steps_unittest.py
Original file line number Diff line number Diff line change
Expand Up @@ -6065,7 +6065,7 @@ def tearDown(self):

def test_success_merge_queue(self):
self.setupStep(DetermineLabelOwner())
self.setProperty('pr_number', 17518)
self.setProperty('github.number', 17518)
self.setProperty('buildername', 'Merge-Queue')
response = {"data": {
"repository": {
Expand Down Expand Up @@ -6096,7 +6096,7 @@ def test_success_merge_queue(self):

def test_failure(self):
self.setupStep(DetermineLabelOwner())
self.setProperty('pr_number', 17518)
self.setProperty('github.number', 17518)
self.setProperty('buildername', 'Merge-Queue')
response = {"data": {
"repository": {
Expand Down

0 comments on commit 7974477

Please sign in to comment.