git cl: delete Rietveld support for tryjobs.
R=ehmaldonado
Bug: 770408
Change-Id: Id070e6084b6beba7309bdc35f0f750decd77e0c9
Reviewed-on: https://chromium-review.googlesource.com/c/1279132
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 466f21c..5687659 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -2468,7 +2468,6 @@
u'category': u'git_cl_try',
u'key': u'val',
u'json': [{u'a': 1}, None],
- u'master': u'tryserver.chromium',
u'patch_gerrit_url':
u'https://chromium-review.googlesource.com',
@@ -2482,79 +2481,24 @@
}
})
self.assertEqual(build, {
- u'bucket': u'master.tryserver.chromium',
+ u'bucket': u'luci.chromium.try',
u'client_operation_id': u'uuid4',
u'tags': [
u'builder:win',
u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
u'user_agent:git_cl_try',
- u'master:tryserver.chromium'],
+ ],
})
self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
self.assertEqual(0, git_cl.main([
- 'try', '-m', 'tryserver.chromium', '-b', 'win',
+ 'try', '-B', 'luci.chromium.try', '-b', 'win',
'-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
self.assertRegexpMatches(
git_cl.sys.stdout.getvalue(),
- 'Tried jobs on:\nBucket: master.tryserver.chromium')
-
- def test_git_cl_try_buildbucket_bucket_flag(self):
- self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
- lambda _: {
- 'owner_email': 'owner@e.mail',
- 'private': False,
- 'closed': False,
- 'project': 'depot_tools',
- 'patchsets': [20001],
- })
- self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
- self.calls = [
- ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
- ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
- ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
- ((['git', 'config', 'rietveld.server'],),
- 'https://codereview.chromium.org'),
- ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
- ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
- ]
-
- def _buildbucket_retry(*_, **kw):
- body = json.loads(kw['body'])
- self.assertEqual(len(body['builds']), 1)
- build = body['builds'][0]
- params = json.loads(build.pop('parameters_json'))
- self.assertEqual(params, {
- u'builder_name': u'win',
- u'changes': [{u'author': {u'email': u'owner@e.mail'},
- u'revision': None}],
- u'properties': {
- u'category': u'git_cl_try',
- u'issue': 123,
- u'patch_project': u'depot_tools',
- u'patch_storage': u'rietveld',
- u'patchset': 20001,
- u'rietveld': u'https://codereview.chromium.org',
- }
- })
- self.assertEqual(build, {
- u'bucket': u'test.bucket',
- u'client_operation_id': u'uuid4',
- u'tags': [u'builder:win',
- u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
- u'user_agent:git_cl_try'],
- })
-
- self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
-
- self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
- self.assertEqual(0, git_cl.main([
- 'try', '-B', 'test.bucket', '-b', 'win']))
- self.assertRegexpMatches(
- git_cl.sys.stdout.getvalue(),
- 'Tried jobs on:\nBucket: test.bucket')
+ 'Tried jobs on:\nBucket: luci.chromium.try')
def test_git_cl_try_bots_on_multiple_masters(self):
self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)