Skip to content
Permalink
Browse files
[EWS] Use EWS as committer when rebasing
https://bugs.webkit.org/show_bug.cgi?id=236650
<rdar://problem/88967428>

Reviewed by Aakash Jain.

* Tools/CISupport/ews-build/steps.py:
(CheckOutPullRequest): Use 'EWS <ews@webkit.org>' as the committer.
* Tools/CISupport/ews-build/steps_unittest.py:


Canonical link: https://commits.webkit.org/247290@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@289847 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
JonWBedard committed Feb 15, 2022
1 parent 2ccff48 commit a2c0ca0f8df6e587f11d2029516f8d64e7503ef0
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 1 deletion.
@@ -31,7 +31,7 @@
from twisted.internet import defer

from layout_test_failures import LayoutTestFailures
from send_email import send_email_to_patch_author, send_email_to_bot_watchers, send_email_to_github_admin
from send_email import send_email_to_patch_author, send_email_to_bot_watchers, send_email_to_github_admin, FROM_EMAIL

import json
import os
@@ -648,6 +648,10 @@ class CheckOutPullRequest(steps.ShellSequence, ShellMixin):
description = ['checking-out-pull-request']
descriptionDone = ['Checked out pull request']
haltOnFailure = True
env = dict(
GIT_COMMITTER_NAME='EWS',
GIT_COMMITTER_EMAIL=FROM_EMAIL,
)

def __init__(self, **kwargs):
super(CheckOutPullRequest, self).__init__(timeout=10 * 60, logEnviron=False, **kwargs)
@@ -3085,6 +3085,11 @@ def test_failure_on_commit_queue(self):


class TestCheckOutPullRequest(BuildStepMixinAdditions, unittest.TestCase):
ENV = dict(
GIT_COMMITTER_NAME='EWS',
GIT_COMMITTER_EMAIL='ews@webkit.org',
)

def setUp(self):
self.longMessage = True
return self.setUpBuildStep()
@@ -3106,36 +3111,43 @@ def test_success(self):
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['/bin/sh', '-c', 'git remote add Contributor https://github.com/Contributor/WebKit.git || true'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'remote', 'set-url', 'Contributor', 'https://github.com/Contributor/WebKit.git'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'fetch', 'Contributor'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'branch', '-f', 'eng/pull-request-branch', 'remotes/Contributor/eng/pull-request-branch'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'checkout', 'eng/pull-request-branch'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'config', 'merge.changelog.driver', 'perl Tools/Scripts/resolve-ChangeLogs --merge-driver -c %O %A %B'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'rebase', '--onto', '59dab0396721db221c264aad3c0cea37ef0d297b', 'aaebef7312238f3ad1d25e8894916a1aaea45ba1', 'eng/pull-request-branch'],
) + 0,
)
@@ -3157,36 +3169,43 @@ def test_success_wincairo(self):
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['cmd', '/c', 'git remote add Contributor https://github.com/Contributor/WebKit.git || exit 0'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'remote', 'set-url', 'Contributor', 'https://github.com/Contributor/WebKit.git'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'fetch', 'Contributor'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'branch', '-f', 'eng/pull-request-branch', 'remotes/Contributor/eng/pull-request-branch'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'checkout', 'eng/pull-request-branch'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'config', 'merge.changelog.driver', 'perl Tools/Scripts/resolve-ChangeLogs --merge-driver -c %O %A %B'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'rebase', '--onto', '59dab0396721db221c264aad3c0cea37ef0d297b', 'aaebef7312238f3ad1d25e8894916a1aaea45ba1', 'eng/pull-request-branch'],
) + 0,
)
@@ -3207,16 +3226,19 @@ def test_failure(self):
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['/bin/sh', '-c', 'git remote add Contributor https://github.com/Contributor/WebKit.git || true'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'remote', 'set-url', 'Contributor', 'https://github.com/Contributor/WebKit.git'],
) + 0, ExpectShell(
workdir='wkdir',
timeout=600,
logEnviron=False,
env=self.ENV,
command=['git', 'fetch', 'Contributor'],
) + 1,
)
@@ -1,3 +1,15 @@
2022-02-15 Jonathan Bedard <jbedard@apple.com>

[EWS] Use EWS as commit author when rebasing
https://bugs.webkit.org/show_bug.cgi?id=236650
<rdar://problem/88967428>

Reviewed by Aakash Jain.

* CISupport/ews-build/steps.py:
(CheckOutPullRequest): Use 'EWS <ews@webkit.org>' as the commit author.
* CISupport/ews-build/steps_unittest.py:

2022-02-15 Jonathan Bedard <jbedard@apple.com>

[git-webkit] --update should be synonomous with --rebase

0 comments on commit a2c0ca0

Please sign in to comment.