commit 3d1277e94e35fd94c6ca2497f109655845614d5c
author Mike Frysinger <vapier@chromium.org> Fri Feb 12 22:15:29 2021 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Feb 16 16:37:03 2021 +0000
tree 2e3802993c6975d6d336d419b2965d12c2c4f2bf
parent 301e5c5c7f03be7056e27fcbbd4db3855612514b

cbuildbot: use default branch for infra/config

Rather than hardcode a specific branch, just update the default branch.
This will make it easy to switch between master & main.

BUG=chromium:1126855
TEST=CQ passes

Change-Id: Ic6fd97ea079f0f295879c7fefdd4977780d3b897
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2692516
Reviewed-by: LaMont Jones <lamontjones@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-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 87a8c57..fe4cb5c 100644
--- a/cbuildbot/stages/config_stages.py
+++ b/cbuildbot/stages/config_stages.py
@@ -406,7 +406,6 @@
 
   PROJECT_URL = os.path.join(constants.INTERNAL_GOB_URL,
                              'chromeos/infra/config')
-  PROJECT_BRANCH = 'master'
 
   def __init__(self, builder_run, buildstore, **kwargs):
     super(DeployLuciSchedulerStage, self).__init__(builder_run, buildstore,
@@ -444,10 +443,10 @@
     """
     self.project_dir = self._MakeWorkDir('luci_config')
 
-    git.Clone(self.project_dir, self.PROJECT_URL, branch=self.PROJECT_BRANCH)
+    git.Clone(self.project_dir, self.PROJECT_URL)
 
-    logging.info('Checked out luci config %s:%s in %s',
-                 self.PROJECT_URL, self.PROJECT_BRANCH, self.project_dir)
+    logging.info('Checked out luci config %s:HEAD in %s',
+                 self.PROJECT_URL, self.project_dir)
 
   def _UpdateLuciProject(self):
     chromite_source_file = os.path.join(constants.CHROMITE_DIR, 'config',
@@ -481,20 +480,17 @@
     git.RunGit(self.project_dir, ['add', '-A'])
     git.RunGit(self.project_dir, ['commit', '-m', message])
 
-    push_to = git.RemoteRef('origin', self.PROJECT_BRANCH)
-    logging.info('Pushing to branch (%s) with message: %s %s', push_to, message,
+    logging.info('Pushing to branch (HEAD) with message: %s %s', message,
                  ' (dryrun)' if self._run.options.debug else '')
     git.RunGit(
         self.project_dir, ['config', 'push.default', 'tracking'],
         print_cmd=True)
-    git.PushBranch(self.PROJECT_BRANCH, self.project_dir,
-                   dryrun=self._run.options.debug)
+    git.PushBranch('HEAD', self.project_dir, dryrun=self._run.options.debug)
     logging.PrintBuildbotStepText('luci-scheduler.cfg: Updated.')
 
   def PerformStage(self):
     """Perform the DeployLuciSchedulerStage."""
-    logging.info('Update luci_scheduler.cfg at %s:%s.',
-                 self.PROJECT_URL, self.PROJECT_BRANCH)
+    logging.info('Update luci_scheduler.cfg at %s:HEAD.', self.PROJECT_URL)
 
     self._RunUnitTest()
     self._CheckoutLuciProject()