commit 0b91bc127459008ed6e068d8f44fca7b2ad8ad1a
author Navil Perez <navil@google.com> Wed Feb 17 23:06:59 2021 +0000
committer Commit Bot <commit-bot@chromium.org> Thu Feb 18 01:43:41 2021 +0000
tree f66d17d4e44a1f455b2927e0dbcfeb8895961c5c
parent e064a0f7bd23a4e42ac066951885bd53f60146eb

config_stages: Config updater push ToT.json to main branch.

Config-updater is failing because it tries to push to a read only
branch (https://ci.chromium.org/b/8855031191051902064).

BUG=chromium:1126855
TEST=CQ passes

Change-Id: If65c264e9a4a677481f09eff0daa7d1df92727c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2702414
Commit-Queue: Navil Perez <navil@google.com>
Tested-by: Navil Perez <navil@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

cbuildbot/stages/config_stages.py

diff --git a/cbuildbot/stages/config_stages.py b/cbuildbot/stages/config_stages.py
index 3bfbd42..7d8da46 100644
--- a/cbuildbot/stages/config_stages.py
+++ b/cbuildbot/stages/config_stages.py
@@ -101,8 +101,8 @@
   if match:
     if match.group(1) == 'ToT':
       # Given 'build_config.ToT.json',
-      # return branch name 'master'.
-      return 'master'
+      # return branch name 'main'.
+      return 'main'
     else:
       # Given 'build_config.release-R51-8172.B.json',
       # return branch name 'release-R51-8172.B'.
@@ -138,7 +138,7 @@
     milestone_path_pairs = []
     for release_template in release_list:
       milestone_num = _GetMilestone(release_template)
-      # Enable config-updater builder for master branch
+      # Enable config-updater builder for main branch
       # and release branches with milestone_num > 53
       if milestone_num and milestone_num > 53:
         milestone_path_pairs.append((milestone_num, release_template))
@@ -303,7 +303,7 @@
     TODO(crbug/1062657): remove the legacy fallback when ConfigUpdater
     no longer runs on a milestone <= 83.
     """
-    if self.branch == 'master':
+    if self.branch == 'main':
       self._RunNewUnitTest()
     else:
       match = re.search(r'release-R(.+)-.*', self.branch)

cbuildbot/stages/config_stages_unittest.py

diff --git a/cbuildbot/stages/config_stages_unittest.py b/cbuildbot/stages/config_stages_unittest.py
index cebfeb6..6ab9988 100644
--- a/cbuildbot/stages/config_stages_unittest.py
+++ b/cbuildbot/stages/config_stages_unittest.py
@@ -176,12 +176,12 @@
       self.assertEqual(
           os.path.basename(config_change_patch), 'config_change.patch')
 
-  def testMasterBasic(self):
-    """Basic test on master branch."""
+  def testMainBasic(self):
+    """Basic test on main branch."""
     template = 'build_config.ToT.json'
     stage = self.ConstructStage(template)
     stage.PerformStage()
-    self.assertTrue(stage.branch == 'master')
+    self.assertTrue(stage.branch == 'main')
 
   def testReleaseBasic(self):
     """Basic test on release branch."""