commit c7a31c1f591e3337b81c6b6aadf3635add2d0459
author David Burger <dburger@chromium.org> Mon Nov 11 16:08:15 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Mon Nov 11 23:55:20 2019 +0000
tree 9ccab75ee0953b85683a7672d85fce9e14d58881
parent 30fb97917e1e3f857e969b96919ff74d6ad1f457

Remove chrome-pfq and chromium-pfq configs.

Following on the heels of removing scheduling of chromium-pfq and
children in https://crrev.com/c/1891252 remove the actual configs.

TEST=./run_tests
TEST=./config/chromeos_config_unittest --update
BUG=chromium:990860

Change-Id: I4df5fde7aedc111b017b4fbb296acd949c06a1d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1910565
Reviewed-by: Sean Abraham <seanabraham@chromium.org>
Reviewed-by: Mike Nichols <mikenichols@chromium.org>
Commit-Queue: David Burger <dburger@chromium.org>
Tested-by: David Burger <dburger@chromium.org>

config/chromeos_config.py

diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index 9ebe818..ad28c9e 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -487,30 +487,6 @@
       vm_tests_override=None,
   )
 
-  # TODO(davidjames): Convert this to an external config once the unified master
-  # logic is ready.
-  site_config.AddTemplate(
-      'chromium_pfq',
-      site_config.templates.internal,
-      site_config.templates.external_chromium_pfq,
-      display_label=config_lib.DISPLAY_LABEL_CHROME_PFQ,
-      description='Preflight Chromium Uprev & Build (internal)',
-      overlays=constants.BOTH_OVERLAYS,
-      prebuilts=constants.PUBLIC,
-      luci_builder=config_lib.LUCI_BUILDER_PFQ,
-      doc='https://dev.chromium.org/chromium-os/build/builder-overview#'
-          'TOC-Chrome-PFQ',
-  )
-
-  site_config.AddTemplate(
-      'chrome_pfq',
-      site_config.templates.chromium_pfq,
-      site_config.templates.official,
-      overlays=constants.BOTH_OVERLAYS,
-      description='Preflight Chrome Uprev & Build (internal)',
-      prebuilts=constants.PRIVATE,
-  )
-
   site_config.AddTemplate(
       'chrome_try',
       build_type=constants.CHROME_PFQ_TYPE,

config/chromeos_test_config.py

diff --git a/config/chromeos_test_config.py b/config/chromeos_test_config.py
index ed4d5ab..8d33831 100644
--- a/config/chromeos_test_config.py
+++ b/config/chromeos_test_config.py
@@ -730,10 +730,6 @@
   )
 
   # BEGIN Chrome PFQ
-  site_config.templates.chrome_pfq.apply(
-      site_config.templates.default_hw_tests_override,
-  )
-
   site_config.templates.chrome_pfq_cheets_informational.apply(
       site_config.templates.default_hw_tests_override,
       hw_tests=hw_test_list.SharedPoolPFQ(),
@@ -751,10 +747,6 @@
   # END Chrome PFQ
 
   # BEGIN Chromium PFQ
-  site_config.templates.chromium_pfq.apply(
-      site_config.templates.default_hw_tests_override,
-  )
-
   site_config.templates.chromium_pfq_informational.apply(
       site_config.templates.default_hw_tests_override,
   )