Stop supporting old Gerrit CQ tryjob properties.

scripts/slave/recipes/run_presubmit.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 DEPS = [
   'depot_tools/bot_update',
   'depot_tools/gclient',
   'depot_tools/git',
   'depot_tools/presubmit',
   'recipe_engine/json',
@@ skipping 59 matching lines @@
     if codereview_auth:
       presubmit_args.extend([
           '--rietveld_email_file',
           api.path['build'].join('site_config', '.rietveld_client_email')])
       presubmit_args.extend([
           '--rietveld_private_key_file',
           api.path['build'].join('site_config', '.rietveld_secret_key')])
     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
     assert False, 'patch_storage %s is not supported' % patch_storage
   if api.properties.get('dry_run'):
     presubmit_args.append('--dry_run')
 
   presubmit_args.extend([
     '--root', abs_root,
     '--commit',
@@ skipping 77 matching lines @@
         mastername='tryserver.chromium.linux',
         buildername='infra_presubmit',
         repo_name='infra',
         patch_project='infra',
         runhooks=True) +
     api.step_data('presubmit', api.json.output([['infra_presubmit',
                                                  ['compile']]]))
   )
 
   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',
         repo_name='infra',
         mastername='tryserver.infra',
         buildername='infra_presubmit',
         runhooks=True) +
     api.step_data('presubmit', api.json.output([['infra_presubmit',
                                                  ['compile']]]))
   )
@@ skipping 45 matching lines @@
   yield (
     api.test('repository_url') +
     api.properties.tryserver(
         mastername='tryserver.chromium.linux',
         buildername='chromium_presubmit',
         repository_url='https://skia.googlesource.com/skia.git',
         solution_name='skia') +
     api.step_data('presubmit',
                   api.json.output([['chromium_presubmit', ['compile']]]))
   )