diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2013-05-10 13:34:40 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2013-05-10 13:34:40 +0300 |
| commit | f0e2c0c556c9b7a422a548a314388d3121495d72 (patch) | |
| tree | dcfe2b19fb782e42c455530d23ebab9ddc400bf9 /node | |
| parent | 66e3e53be42d1e51db81af53dece8e3059a8a734 (diff) | |
Update restrictedness checks to handle multiple restricted groups.
Diffstat (limited to 'node')
| -rwxr-xr-x | node/prepare_build_config.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node/prepare_build_config.py b/node/prepare_build_config.py index 2697dd7..e028407 100755 --- a/node/prepare_build_config.py +++ b/node/prepare_build_config.py @@ -53,7 +53,7 @@ def validate_config(config, slave_type): else: slave_type_cat = "normal" - if owner in ["linaro-android-private", "linaro-android-restricted"]: + if owner.endswith("-restricted"): owner_cat = "restricted" else: owner_cat = "normal" @@ -68,10 +68,10 @@ def validate_config(config, slave_type): # Now, process few most expected mismatches in adhoc way, # to provide better error messages if slave_type_cat == "restricted" and owner_cat != "restricted": - raise BuildConfigMismatchException("Only jobs owned by ~linaro-android-restricted may run on this build slave type") + raise BuildConfigMismatchException("Only jobs owned by ~linaro-android-*-restricted may run on this build slave type") if owner_cat == "restricted" and build_type_cat != "restricted": - raise BuildConfigMismatchException("Jobs owned by ~linaro-android-restricted must use BUILD_TYPE=build-android-*-restricted") + raise BuildConfigMismatchException("Jobs owned by ~linaro-android-*-restricted must use BUILD_TYPE=build-android-*-restricted") # Finally, generic mismatch detection if slave_type_cat != owner_cat or slave_type_cat != build_type_cat: |