commit 13cb24c76e7e78937b214949cb9df894173bfcad
author Mike Nichols <mikenichols@chromium.org> Mon Apr 22 15:29:21 2019 -0600
committer Mike Nichols <mikenichols@chromium.org> Mon Apr 22 23:52:23 2019 +0000
tree ab381c2caead9a09dc2da7d858d1392c6363cd7c
parent 06df2c4fd1b49ee7ef6fd466fe9cfc93ebd20ca1

chromeos_config: Migrate release builds to release builders

Migrate the standard release builds to utilize the Release Buildbucket
builder, associated with dedicated release bots.

BUG=chromium:939553
TEST='cros_sdk -- /mnt/host/source/chromite/run_tests'

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

config/chromeos_config.py

diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index 42e6cbe..370a922 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -655,7 +655,7 @@
   )
 
   site_config.AddTemplate(
-      'release',
+      'release_common',
       site_config.templates.full,
       site_config.templates.official,
       site_config.templates.internal,
@@ -705,13 +705,18 @@
   )
 
   site_config.AddTemplate(
+      'release',
+      site_config.templates.release_common,
+      luci_builder=config_lib.LUCI_BUILDER_RELEASE,
+  )
+
+  site_config.AddTemplate(
       'factory_firmware',
-      site_config.templates.release,
+      site_config.templates.release_common,
       luci_builder=config_lib.LUCI_BUILDER_FACTORY,
   )
 
   ### Release AFDO configs.
-
   site_config.AddTemplate(
       'release_afdo',
       site_config.templates.release,

config/config_dump.json

diff --git a/config/config_dump.json b/config/config_dump.json
index ae385c2..099faef 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -791,6 +791,7 @@
                 "factory_install"
             ],
             "internal": true,
+            "luci_builder": "Release",
             "manifest": "official.xml",
             "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
             "manifest_version": true,
@@ -1014,6 +1015,7 @@
                 "factory_install"
             ],
             "internal": true,
+            "luci_builder": "Release",
             "manifest": "official.xml",
             "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
             "manifest_version": true,
@@ -1074,6 +1076,7 @@
                 "factory_install"
             ],
             "internal": true,
+            "luci_builder": "Release",
             "manifest": "official.xml",
             "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
             "manifest_version": true,
@@ -1143,6 +1146,7 @@
                 "factory_install"
             ],
             "internal": true,
+            "luci_builder": "Release",
             "manifest": "official.xml",
             "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
             "manifest_version": true,

config/luci-scheduler.cfg

diff --git a/config/luci-scheduler.cfg b/config/luci-scheduler.cfg
index 9add2e8..0faa0db 100644
--- a/config/luci-scheduler.cfg
+++ b/config/luci-scheduler.cfg
@@ -2745,7 +2745,7 @@
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromeos.general"
-    builder: "Prod"
+    builder: "Release"
     tags: "cbb_branch:master"
     tags: "cbb_config:master-lakitu-release"
     tags: "cbb_display_label:release"
@@ -2853,7 +2853,7 @@
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromeos.general"
-    builder: "Prod"
+    builder: "Release"
     tags: "cbb_branch:master"
     tags: "cbb_config:master-release"
     tags: "cbb_display_label:release"