diff options
author | Mike Frysinger <vapier@chromium.org> | 2014-09-05 01:45:05 -0400 |
---|---|---|
committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-09-30 05:42:02 +0000 |
commit | 113e98a0c3deb7c0a6ffab60b435cfc8f47fb027 (patch) | |
tree | 8ffc3ae9c33739c8563852b49cb5c06fe6f23c41 /cbuildbot/repository.py | |
parent | 5164838fc4d5b5f23da4091da696851d09fc3cbd (diff) | |
download | chromite-113e98a0c3deb7c0a6ffab60b435cfc8f47fb027.tar.gz |
cros_build_lib_unittest.TestManifestCheckout: use local repos instead
In order to avoid fetching via the network, use the local manifest/repo
git dirs instead.
BUG=chromium:343912
TEST=lib/cros_build_lib_unittest.py passes w/out network
Change-Id: Ia28dda28305581daeae0300f2fc6fd9e0e7f550f
Reviewed-on: https://chromium-review.googlesource.com/216537
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'cbuildbot/repository.py')
-rw-r--r-- | cbuildbot/repository.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/cbuildbot/repository.py b/cbuildbot/repository.py index 79f1d3fa6..f63908cd4 100644 --- a/cbuildbot/repository.py +++ b/cbuildbot/repository.py @@ -129,7 +129,7 @@ class RepoRepository(object): """A Class that encapsulates a repo repository. Args: - repo_url: gitserver URL to fetch repo manifest from. + manifest_repo_url: URL to fetch repo manifest from. directory: local path where to checkout the repository. branch: Branch to check out the manifest at. referenced_repo: Repository to reference for git objects, if possible. @@ -137,16 +137,21 @@ class RepoRepository(object): default.xml if not given. depth: Mutually exclusive option to referenced_repo; this limits the checkout to a max commit history of the given integer. + repo_url: URL to fetch repo tool from. + repo_branch: Branch to check out the repo tool at. """ # Use our own repo, in case android.kernel.org (the default location) is down. - _INIT_CMD = ['repo', 'init', '--repo-url', constants.REPO_URL] + _INIT_CMD = ['repo', 'init'] # If a repo hasn't been used in the last 5 runs, wipe it. LRU_THRESHOLD = 5 - def __init__(self, repo_url, directory, branch=None, referenced_repo=None, - manifest=constants.DEFAULT_MANIFEST, depth=None): + def __init__(self, manifest_repo_url, directory, branch=None, + referenced_repo=None, manifest=constants.DEFAULT_MANIFEST, + depth=None, repo_url=constants.REPO_URL, repo_branch=None): + self.manifest_repo_url = manifest_repo_url self.repo_url = repo_url + self.repo_branch = repo_branch self.directory = directory self.branch = branch @@ -224,7 +229,8 @@ class RepoRepository(object): ignore_missing=True) self._repo_update_needed = False - init_cmd = self._INIT_CMD + ['--manifest-url', self.repo_url] + init_cmd = self._INIT_CMD + ['--repo-url', self.repo_url, + '--manifest-url', self.manifest_repo_url] if self._referenced_repo: init_cmd.extend(['--reference', self._referenced_repo]) if self._manifest: @@ -235,6 +241,8 @@ class RepoRepository(object): # Handle branch / manifest options. if self.branch: init_cmd.extend(['--manifest-branch', self.branch]) + if self.repo_branch: + init_cmd.extend(['--repo-branch', self.repo_branch]) cros_build_lib.RunCommand(init_cmd, cwd=self.directory, input='\n\ny\n') if local_manifest and local_manifest != self._manifest: |