diff options
author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-06-09 14:43:07 +0530 |
---|---|---|
committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-06-09 14:43:10 +0530 |
commit | ff66ebb4b87e5d4735f5d9caffd1333684ecdeea (patch) | |
tree | 3bea9f70ddce585a9a9c87ae02190c197121b139 /build-scripts/post-build-lava.py | |
parent | 7d0277343c5fcb694013594fb1059ecdbe81c514 (diff) |
Don't submit LAVA_TEST_PLAN job when not needed.
LAVA_TEST_PLAN gets submitted by default even when
we submit job template using default lava_test_plan
creating a new unwanted job.
Change-Id: I45cb1d4e05bf6e188cacfc77dfae4e8da59b03c6
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
Diffstat (limited to 'build-scripts/post-build-lava.py')
-rwxr-xr-x | build-scripts/post-build-lava.py | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/build-scripts/post-build-lava.py b/build-scripts/post-build-lava.py index 1f5ec6a..61633b9 100755 --- a/build-scripts/post-build-lava.py +++ b/build-scripts/post-build-lava.py @@ -717,28 +717,30 @@ def main(): if get_env_var('SUBMIT_JOB_FROM_URL') == 'true': submit_job_from_url() - common_actions = [gen_deploy_action()] - - install_binaries_action = gen_install_binaries_action() - if install_binaries_action: - common_actions.append(install_binaries_action) - - common_actions.append(gen_boot_action()) - - plan_list = get_plan_list() - # Create a copy of common actions - for plan in plan_list: - actions = copy.deepcopy(common_actions) - if plan == "LAVA_TEST_PLAN": - actions.extend(gen_test_actions()) - else: - actions.extend(gen_test_plan_actions(get_env_var(plan))) - actions.append(gen_submit_action()) - - devices = get_lava_device_type_or_target() - for dev in devices: - config = gen_config(actions=actions, device=dev) - submit_job(config=config, plan=plan) + """Don't submit LAVA_TEST_PLAN when not intended""" + if get_env_var('SUBMIT_JOB_FROM_TEST_PLAN') != 'false': + common_actions = [gen_deploy_action()] + + install_binaries_action = gen_install_binaries_action() + if install_binaries_action: + common_actions.append(install_binaries_action) + + common_actions.append(gen_boot_action()) + + plan_list = get_plan_list() + # Create a copy of common actions + for plan in plan_list: + actions = copy.deepcopy(common_actions) + if plan == "LAVA_TEST_PLAN": + actions.extend(gen_test_actions()) + else: + actions.extend(gen_test_plan_actions(get_env_var(plan))) + actions.append(gen_submit_action()) + + devices = get_lava_device_type_or_target() + for dev in devices: + config = gen_config(actions=actions, device=dev) + submit_job(config=config, plan=plan) if __name__ == "__main__": |