diff options
| author | David James <davidjames@google.com> | 2015-03-24 09:01:01 -0700 |
|---|---|---|
| committer | David James <davidjames@chromium.org> | 2015-03-24 18:31:02 +0000 |
| commit | d12039904589bd919af4eb986d0d1a116d389b61 (patch) | |
| tree | 16612ecc48a710ea72d6f61aea6e2e12de4e311d /cbuildbot/update_binhost_json.py | |
| parent | c4072e585204a7d87f66ec40d8bcd06b85435572 (diff) | |
| download | chromite-d12039904589bd919af4eb986d0d1a116d389b61.tar.gz | |
binhost_test: Allow for no changes when Chrome PFQ runs.
It is expected that usually the Chrome PFQ will have no changes
to the binhost JSON, so we should allow for empty commits. These
get squashed together anyway at the end of the run (and prebuilts
are stored in this dir) so the final commit won't be an empty one.
Fixes this error (see MasterUploadPrebuilts):
http://chromegw/i/chromeos/builders/Chrome%20PFQ%20master/builds/1083
update_binhost_json: Unhandled exception:
...
On branch stabilizing_branch
Your branch is ahead of 'cros-internal/master' by 8 commits.
(use "git push" to publish your local commits)
nothing to commit, working directory clean
BUG=chromium:443254
TEST=New unit test.
Change-Id: Idcef986d246f593ee934b7845e2b151b5ccab79f
Reviewed-on: https://chromium-review.googlesource.com/262210
Trybot-Ready: David James <davidjames@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Diffstat (limited to 'cbuildbot/update_binhost_json.py')
| -rw-r--r-- | cbuildbot/update_binhost_json.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cbuildbot/update_binhost_json.py b/cbuildbot/update_binhost_json.py index 53986c774..8b760ad96 100644 --- a/cbuildbot/update_binhost_json.py +++ b/cbuildbot/update_binhost_json.py @@ -47,4 +47,5 @@ def main(argv): filename = binhost.PrebuiltMapping.GetFilename(opts.buildroot, 'chrome') pfq_configs.Dump(filename) git.AddPath(filename) - git.Commit(os.path.dirname(filename), 'Update PFQ config dump') + git.Commit(os.path.dirname(filename), 'Update PFQ config dump', + allow_empty=True) |