Fix projectname check for cros-internal overlays.
Change-Id: I9aa48fbe33e494bc04a8dd65e1a7b86ec292e8ee
diff --git a/buildbot/cbuildbot_commands.py b/buildbot/cbuildbot_commands.py
index 45beef4..cdd6f4d 100644
--- a/buildbot/cbuildbot_commands.py
+++ b/buildbot/cbuildbot_commands.py
@@ -63,8 +63,8 @@
'-c',
'git',
'config',
- 'url.ssh://git@gitrw.chromium.org:9222.insteadof',
- 'http://git.chromium.org/git'
+ 'url.ssh://gerrit.chromium.org:29418.insteadof',
+ 'http://git.chromium.org'
], cwd=buildroot)
retries = 0
except:
diff --git a/buildbot/cros_mark_as_stable.py b/buildbot/cros_mark_as_stable.py
index 7d4e871..0747b32 100755
--- a/buildbot/cros_mark_as_stable.py
+++ b/buildbot/cros_mark_as_stable.py
@@ -367,7 +367,8 @@
# NOTE: chromeos-kernel has the wrong project name, so it fails this
# check.
# TODO(davidjames): Fix the project name in the chromeos-kernel ebuild.
- cmd = 'cd %s && git config --get remote.cros.projectname' % srcdir
+ cmd = ('cd %s && ( git config --get remote.cros.projectname || '
+ 'git config --get remote.cros-internal.projectname )') % srcdir
actual_project = _SimpleRunCommand(cmd).rstrip()
if project not in (actual_project, 'chromeos-kernel'):
Die('Project name mismatch for %s (%s != %s)' % (unstable_ebuild, project,
diff --git a/buildbot/cros_mark_chrome_as_stable.py b/buildbot/cros_mark_chrome_as_stable.py
index 4439890..bd050e8 100755
--- a/buildbot/cros_mark_chrome_as_stable.py
+++ b/buildbot/cros_mark_chrome_as_stable.py
@@ -338,9 +338,10 @@
else:
Info('No stable candidate found.')
+ tracking_branch = 'remotes/m/%s' % os.path.basename(options.tracking_branch)
os.chdir(overlay_dir)
work_branch = cros_mark_as_stable.GitBranch(
- cros_mark_as_stable.STABLE_BRANCH_NAME, options.tracking_branch)
+ cros_mark_as_stable.STABLE_BRANCH_NAME, tracking_branch)
work_branch.CreateBranch()
chrome_version_atom = MarkChromeEBuildAsStable(
stable_candidate, unstable_ebuild, chrome_rev, version_to_uprev,
