Remove implied CIPD packages from scripts/trigger.py

All of chromium's test pools should have these packages automatically
added via task templates. So there's no need to add them ourselves
in this script.

Bug: chromium:812428
Change-Id: I283ad5963cdf237220545c5ed1f21892f6ade18e
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2241901
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

scripts/trigger.py

@@ -25,47 +25,6 @@ def parse_args():
     return parser.parse_known_args()
 
 
-# Taken from:
-# https://chromium.googlesource.com/chromium/src/tools/mb/+/2192df66cd0ed214bcfbfd387ad0c5c8c0a21eb1/mb.py#586
-def add_base_software(swarming_args):
-    # HACK(iannucci): These packages SHOULD NOT BE HERE.
-    # Remove method once Swarming Pool Task Templates are implemented.
-    # crbug.com/812428
-
-    # Add in required base software. This should be kept in sync with the
-    # `chromium_swarming` recipe module in build.git. All references to
-    # `swarming_module` below are purely due to this.
-    cipd_packages = [
-        ('infra/python/cpython/${platform}', 'version:2.7.15.chromium14'),
-        ('infra/tools/luci/logdog/butler/${platform}',
-         'git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c'),
-        ('infra/tools/luci/vpython-native/${platform}',
-         'git_revision:e317c7d2c17d4c3460ee37524dfce4e1dee4306a'),
-        ('infra/tools/luci/vpython/${platform}',
-         'git_revision:e317c7d2c17d4c3460ee37524dfce4e1dee4306a'),
-    ]
-
-    for pkg, vers in cipd_packages:
-        swarming_args.append('--cipd-package=.swarming_module:%s=%s' % (pkg, vers))
-
-    # Add packages to $PATH
-    swarming_args.extend([
-        '--env-prefix',
-        'PATH=.swarming_module',
-        '--env-prefix',
-        'PATH=.swarming_module/bin',
-    ])
-
-    # Add cache directives for vpython.
-    vpython_cache_path = '.swarming_module_cache/vpython'
-    swarming_args.extend([
-        '--named-cache',
-        'swarming_module_cache_vpython=' + vpython_cache_path,
-        '--env-prefix',
-        'VPYTHON_VIRTUALENV_ROOT=' + vpython_cache_path,
-    ])
-
-
 def main():
     args, unknown = parse_args()
     path = args.gn_path.replace('\\', '/')
@@ -96,8 +55,6 @@ def main():
         '-d', 'gpu=' + args.gpu_dim, '-s', sha
     ]
 
-    add_base_software(swarming_args)
-
     for i in range(args.shards):
         shard_args = swarming_args[:]
         shard_args.extend([