summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Jacques <dnj@chromium.org>2015-10-12 08:22:05 -0700
committerchrome-bot <chrome-bot@chromium.org>2015-10-14 22:11:13 -0700
commitcffbee5f115afd9b9211a494a7706f1e512a893e (patch)
tree6837ad9d3361349fe97c845c22731cef34680d8d
parente5b01bbbd0617fa06a189d1084f4a6abb80d0bd9 (diff)
downloadchromite-cffbee5f115afd9b9211a494a7706f1e512a893e.tar.gz
compute: Use Git slave checkouts.
BUG=chromium:533026 TEST=None Change-Id: Ied8f9b500ccada49be90d3d0908b37eff5bcca87 Reviewed-on: https://chromium-review.googlesource.com/305220 Commit-Ready: Daniel Jacques <dnj@chromium.org> Tested-by: Daniel Jacques <dnj@chromium.org> Reviewed-by: Chris Sosa <sosa@chromium.org>
-rw-r--r--compute/bot_constants.py6
-rw-r--r--compute/setup_bot.py3
2 files changed, 6 insertions, 3 deletions
diff --git a/compute/bot_constants.py b/compute/bot_constants.py
index aa8e1ef51..286bef5b0 100644
--- a/compute/bot_constants.py
+++ b/compute/bot_constants.py
@@ -15,8 +15,10 @@ BUILDBOT_USER = 'chrome-bot'
CHROMITE_URL = 'https://chromium.googlesource.com/chromiumos/chromite'
DEPOT_TOOLS_URL = ('https://chromium.googlesource.com/chromium/tools/'
'depot_tools.git')
-BUILDBOT_GIT_REPO = ('https://chrome-internal.googlesource.com/chrome/tools/'
- 'build/internal.DEPS')
+CHROME_INFRA_SLAVE_REPO = ('https://chrome-internal.googlesource.com/chrome/'
+ 'tools/build/internal.DEPS.git')
+CHROME_INFRA_SLAVE_DEPS_FILE = '.DEPS.git'
+
CHROMIUM_BUILD_URL = 'https://chromium.googlesource.com/chromium/src/build'
GCOMPUTE_TOOLS_URL = 'https://gerrit.googlesource.com/gcompute-tools'
diff --git a/compute/setup_bot.py b/compute/setup_bot.py
index ff4e92376..84d5fe923 100644
--- a/compute/setup_bot.py
+++ b/compute/setup_bot.py
@@ -191,7 +191,8 @@ def SetupBuildbotEnvironment():
# `gclient` relies on depot_tools in $PATH, pass the extra
# envinornment variable.
path_env = '%s:%s' % (os.getenv('PATH'), tmp_depot_tools_path)
- RunCommand(['gclient', 'config', bot_constants.BUILDBOT_GIT_REPO],
+ RunCommand(['gclient', 'config', bot_constants.CHROME_INFRA_SLAVE_REPO,
+ '--deps-file', bot_constants.CHROME_INFRA_SLAVE_DEPS_FILE],
cwd=bot_constants.BUILDBOT_DIR, extra_env={'PATH': path_env})
RunCommand(['gclient', 'sync', '--jobs', '5'],
cwd=bot_constants.BUILDBOT_DIR,