diff options
author | liang gao <jean.gaoliang@huawei.com> | 2016-07-18 03:09:33 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-18 03:09:34 +0000 |
commit | 3a3ccbd79d47333ce7626674c68a4cdfac44020d (patch) | |
tree | 93c83b3ff059aeb496e4b840214cbedef1f4688d /yardstick | |
parent | 428c72a39bde85d29fae024e1f3d38f5a177f292 (diff) | |
parent | 1a5b8201bf77cfcea5915b6cc8baca2cd33eba1d (diff) |
Merge "change ci from base-on-pod to base-on-scenario (in progress)"
Diffstat (limited to 'yardstick')
-rw-r--r-- | yardstick/cmd/commands/task.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/yardstick/cmd/commands/task.py b/yardstick/cmd/commands/task.py index 2bc5abe29..587f62412 100644 --- a/yardstick/cmd/commands/task.py +++ b/yardstick/cmd/commands/task.py @@ -282,8 +282,17 @@ class TaskParser(object): precondition = cfg["precondition"] installer_type = precondition.get("installer_type", None) deploy_scenarios = precondition.get("deploy_scenarios", None) + tc_fit_pods = precondition.get("pod_name", None) installer_type_env = os.environ.get('INSTALL_TYPE', None) deploy_scenario_env = os.environ.get('DEPLOY_SCENARIO', None) + pod_name_env = os.environ.get('NODE_NAME', None) + + LOG.info("installer_type: %s, installer_type_env: %s", + installer_type, installer_type_env) + LOG.info("deploy_scenarios: %s, deploy_scenario_env: %s", + deploy_scenarios, deploy_scenario_env) + LOG.info("tc_fit_pods: %s, pod_name_env: %s", + tc_fit_pods, pod_name_env) if installer_type and installer_type_env: if installer_type_env not in installer_type: return False @@ -293,6 +302,9 @@ class TaskParser(object): if deploy_scenario_env.startswith(deploy_scenario): return True return False + if tc_fit_pods and pod_name_env: + if pod_name_env not in tc_fit_pods: + return False return True |