Revert "git-cl: Use bb to schedule try jobs."
This reverts commit 5b6ae8bc74d18033d8880e6183efa9ef6ca71de3.
Reason for revert: Suspected breakage of wpt-importer (https://ci.chromium.org/p/infra/builders/cron/wpt-importer)
Original change's description:
> git-cl: Use bb to schedule try jobs.
>
> Bug: 976104
> Change-Id: I3423667f1ed9edfc5fa17842932de7704951fc62
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1801799
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
TBR=nodir@chromium.org,tandrii@google.com,ehmaldonado@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 976104
Change-Id: I885c1e71b34928c402d3375f820b28f3d6535c54
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1806148
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index ce67b88..cceb3eb 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -2381,42 +2381,6 @@
def test_git_cl_try_buildbucket_with_properties_gerrit(self):
self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
- def mocked_call_with_stdin(*a, **kw):
- args = list(a)
- if kw.get('stdin'):
- args.append(kw['stdin'])
- return ([self._mocked_call(*args), ''], 0)
-
- self.mock(subprocess2, 'communicate', mocked_call_with_stdin)
-
- bb_request = json.dumps({
- "requests": [{
- "scheduleBuild": {
- "requestId": "uuid4",
- "builder": {
- "project": "luci",
- "builder": "win",
- "bucket": "chromium.try",
- },
- "gerritChanges": [{
- "project": "depot_tools",
- "host": "chromium-review.googlesource.com",
- "patchset": 7,
- "change": 123456,
- }],
- "properties": {
- "category": "git_cl_try",
- "json": [{"a": 1}, None],
- "key": "val",
- },
- "tags": [
- {"value": "win", "key": "builder"},
- {"value": "git_cl_try", "key": "user_agent"},
- ],
- },
- }],
- }, sort_keys=True)
-
self.calls = [
((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
@@ -2446,12 +2410,46 @@
},
},
}),
- ((['bb', 'auth-info'],), ''),
- ((['git', 'config', 'branch.feature.gerritpatchset'],), '7'),
- ((['bb', 'batch', '-host', 'cr-buildbucket.appspot.com'],
- bb_request,), ''),
]
+ def _buildbucket_retry(*_, **kw):
+ # self.maxDiff = 10000
+ 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'key': u'val',
+ u'json': [{u'a': 1}, None],
+
+ u'patch_gerrit_url':
+ u'https://chromium-review.googlesource.com',
+ u'patch_issue': 123456,
+ u'patch_project': u'depot_tools',
+ u'patch_ref': u'refs/changes/56/123456/7',
+ u'patch_repository_url':
+ u'https://chromium.googlesource.com/depot_tools',
+ u'patch_set': 7,
+ u'patch_storage': u'gerrit',
+ }
+ })
+ self.assertEqual(build, {
+ 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',
+ ],
+ })
+
+ self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
+
self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
self.assertEqual(0, git_cl.main([
'try', '-B', 'luci.chromium.try', '-b', 'win',