Get rid of --use-repository-packages and --use-public-packages.

tools/bots/pkg.py

Index: tools/bots/pkg.py
diff --git a/tools/bots/pkg.py b/tools/bots/pkg.py
index 7dad67378d87478365d46255c0896c5563f87eb2..2ee259514e3d4e656030231be7c1e3029d3ee238 100644
--- a/tools/bots/pkg.py
+++ b/tools/bots/pkg.py
@@ -17,13 +17,12 @@ import sys
 
 import bot
 
-PKG_BUILDER = r'pkg-(linux|mac|win)(-(russian))?(-(debug))?'
+PKG_BUILDER = r'pkg-(linux|mac|win)(-(russian))?'
 
 def PkgConfig(name, is_buildbot):
   """Returns info for the current buildbot based on the name of the builder.
 
   Currently, this is just:
-  - mode: "debug", "release"
   - system: "linux", "mac", or "win"
   """
   pkg_pattern = re.match(PKG_BUILDER, name)
@@ -32,10 +31,9 @@ def PkgConfig(name, is_buildbot):
 
   system = pkg_pattern.group(1)
   locale = pkg_pattern.group(3)
-  mode = pkg_pattern.group(5) or 'release'
   if system == 'win': system = 'windows'
 
-  return bot.BuildInfo('none', 'vm', mode, system, checked=True,
+  return bot.BuildInfo('none', 'vm', 'release', system, checked=True,
                        builder_tag=locale)
 
 def PkgSteps(build_info):
@@ -44,8 +42,7 @@ def PkgSteps(build_info):
     common_args.append('--builder-tag=%s' % build_info.builder_tag)
 
   # There are a number of big/integration tests in pkg, run with bigger timeout
-  timeout = 300 if build_info.mode == 'debug' else 120
-  common_args.append('--timeout=%s' % timeout)
+  common_args.append('--timeout=120')
   # We have some unreproducible vm crashes on these bots
   common_args.append('--copy-coredumps')
 
@@ -58,25 +55,17 @@ def PkgSteps(build_info):
               common_args + ['pkg', 'docs'],
               swallow_error=True)
 
-  # Pkg tests currently have a lot of timeouts when run in debug mode.
-  # See issue 18479
-  if build_info.mode != 'release': return
-
   with bot.BuildStep('third_party pkg tests', swallow_error=True):
     pkg_tested = os.path.join('third_party', 'pkg_tested')
     for entry in os.listdir(pkg_tested):
       path = os.path.join(pkg_tested, entry)
-      if os.path.isdir(path): bot.RunTestRunner(build_info, path)
+      if os.path.isdir(path):
+        bot.RunTestRunner(build_info, path)
 
   pkgbuild_build_info = bot.BuildInfo('none', 'vm', build_info.mode,
                                       build_info.system, checked=False)
-  bot.RunTest('pkgbuild_repo_pkgs', pkgbuild_build_info,
-              common_args + ['--append_logs', '--use-repository-packages',
-                             'pkgbuild'],
-              swallow_error=True)
 
-  public_args = (common_args +
-                 ['--append_logs', '--use-public-packages', 'pkgbuild'])
+  public_args = (common_args + ['--append_logs', 'pkgbuild'])
   bot.RunTest('pkgbuild_public_pkgs', pkgbuild_build_info, public_args)
 
 if __name__ == '__main__':