diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2013-01-09 22:23:44 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2013-01-09 22:23:44 +0200 |
| commit | 0d645df538726de99f2e403b383a7b5d1f1bdf65 (patch) | |
| tree | 1353f83d04f882816a027dcba09fbd87384d035e | |
| parent | d83132e9bde79a530686bad14e287565ce18caa1 (diff) | |
Add new build type: build-android-toolchain-linaro-restricted .
| -rw-r--r-- | build-scripts/build-android-toolchain-linaro-restricted | 11 | ||||
| -rwxr-xr-x | node/prepare_build_config.py | 6 |
2 files changed, 15 insertions, 2 deletions
diff --git a/build-scripts/build-android-toolchain-linaro-restricted b/build-scripts/build-android-toolchain-linaro-restricted new file mode 100644 index 0000000..48a90d7 --- /dev/null +++ b/build-scripts/build-android-toolchain-linaro-restricted @@ -0,0 +1,11 @@ +############################################################################### +# Copyright (c) 2013 Linaro +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################### + +set +x +export GIT_SSH=/var/run/lava/ssh +exec bash -xe ${BUILD_SCRIPT_ROOT}/build-android-toolchain-linaro "$@" diff --git a/node/prepare_build_config.py b/node/prepare_build_config.py index 7708ff4..2697dd7 100755 --- a/node/prepare_build_config.py +++ b/node/prepare_build_config.py @@ -58,7 +58,9 @@ def validate_config(config, slave_type): else: owner_cat = "normal" - if config.get("BUILD_TYPE", "build-android") in ["build-android-private", "build-android-restricted"]: + if config.get("BUILD_TYPE", "build-android") in ["build-android-private", + "build-android-restricted", + "build-android-toolchain-linaro-restricted"]: build_type_cat = "restricted" else: build_type_cat = "normal" @@ -69,7 +71,7 @@ def validate_config(config, 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: |