diff options
Diffstat (limited to 'cbuildbot/config_lib.py')
| -rw-r--r-- | cbuildbot/config_lib.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cbuildbot/config_lib.py b/cbuildbot/config_lib.py index b9f71b26a..226ad0bf0 100644 --- a/cbuildbot/config_lib.py +++ b/cbuildbot/config_lib.py @@ -269,7 +269,6 @@ class HWTestConfig(object): Some combinations of member settings are invalid: * A suite config may not specify both blocking and async. - * A suite config may not specify both retry and async. * A suite config may not specify both warn_only and critical. """ # This timeout is larger than it needs to be because of autotest overhead. @@ -284,7 +283,7 @@ class HWTestConfig(object): retry=True, max_retries=10, minimum_duts=0, suite_min_duts=0, offload_failures_only=False): """Constructor -- see members above.""" - assert not async or (not blocking and not retry) + assert not async or not blocking assert not warn_only or not critical self.suite = suite self.num = num @@ -699,6 +698,10 @@ def DefaultSettings(): # manifest versions that we may later want to branch off of. branch_util_test=False, + # If specified, it is passed on to the PushImage script as '--sign-types' + # commandline argument. Must be either None or a list of image types. + sign_types=None, + # TODO(sosa): Collapse to one option. # ========== Dev installer prebuilts options ======================= @@ -873,7 +876,10 @@ def DefaultSiteParameters(): INTERNAL_MANIFEST_VERSIONS_PATH=None, # URL of the repo project. - REPO_URL='https://chromium.googlesource.com/external/repo' + REPO_URL='https://chromium.googlesource.com/external/repo', + + # GS URL in which to archive build artifacts. + ARCHIVE_URL='gs://chromeos-image-archive', ) return default_site_params |