Chromium Code Reviews

Unified Diff: scripts/slave/recipes/run_presubmit.py

Issue 2463653002: Stop supporting old Gerrit CQ tryjob properties. (Closed)
Patch Set: review Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Index: scripts/slave/recipes/run_presubmit.py
diff --git a/scripts/slave/recipes/run_presubmit.py b/scripts/slave/recipes/run_presubmit.py
index 295de3bb16c743ebd703844c7f97a0cb8f158ca9..29a2f8f6028641ae48db5407b5ce6a3c1806b704 100644
--- a/scripts/slave/recipes/run_presubmit.py
+++ b/scripts/slave/recipes/run_presubmit.py
@@ -77,19 +77,10 @@ def _RunStepsInternal(api):
else:
presubmit_args.extend(['--rietveld_email', '']) # activate anonymous mode
elif patch_storage == 'gerrit':
- gerrit_url = api.properties.get('patch_gerrit_url')
- if not gerrit_url:
- # TODO(tandrii): clean up old Gerrit patch properties.
- # Field event.patchSet.ref looks like 'refs/changes/11/338811/4'
- issue, patchset = api.properties['event.patchSet.ref'].split('/')[-2:]
- gerrit_url = api.properties['gerrit']
- else:
- issue = api.properties.get('patch_issue')
- patchset = api.properties.get('patch_set')
presubmit_args = [
- '--issue', issue,
- '--patchset', patchset,
- '--gerrit_url', gerrit_url,
+ '--issue', api.properties['patch_issue'],
+ '--patchset', api.properties['patch_set'],
+ '--gerrit_url', api.properties['patch_gerrit_url'],
'--gerrit_fetch',
]
else: # pragma: no cover
@@ -187,18 +178,6 @@ def GenTests(api):
)
yield (
- api.test('infra_with_runhooks_and_gerrit_deprecated') +
- api.properties.tryserver_gerrit(
- full_project_name='infra/infra',
- repo_name='infra',
- mastername='tryserver.infra',
- buildername='infra_presubmit',
- runhooks=True) +
- api.step_data('presubmit', api.json.output([['infra_presubmit',
- ['compile']]]))
- )
-
- yield (
api.test('infra_with_runhooks_and_gerrit') +
api.properties.tryserver(
gerrit_project='infra/infra',

Powered by Google App Engine