Index: scripts/slave/recipes/run_presubmit.py |
diff --git a/scripts/slave/recipes/run_presubmit.py b/scripts/slave/recipes/run_presubmit.py |
index 44f249a68b5af328679a444c7515044b6380dc48..02fd32cc73d4a6331cd42a4dba04a2b567c46c45 100644 |
--- a/scripts/slave/recipes/run_presubmit.py |
+++ b/scripts/slave/recipes/run_presubmit.py |
@@ -64,14 +64,8 @@ def _RunStepsInternal(api): |
presubmit_args.extend(['--rietveld_email', '']) # activate anonymous mode |
elif patch_storage == 'gerrit': |
gerrit_url = api.properties.get('patch_gerrit_url') |
Michael Achenbach
2016/11/07 12:54:00
Same as in another CL: Does it make sense to use g
tandrii(chromium)
2016/11/07 13:01:08
sorry. Simplified.
|
- 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') |
+ issue = api.properties.get('patch_issue') |
+ patchset = api.properties.get('patch_set') |
presubmit_args = [ |
'--issue', issue, |
'--patchset', patchset, |
@@ -173,18 +167,6 @@ def GenTests(api): |
) |
yield ( |
- api.test('infra_with_runhooks_and_gerrit_deprecated') + |
Michael Achenbach
2016/11/07 12:54:00
Missing deletion of the file?
tandrii(chromium)
2016/11/07 13:01:08
Done.
|
- 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', |