From b9b5605da3dc6d4c2d2ba257cc33d734f30fa116 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Tue, 5 May 2015 11:55:50 +0300 Subject: [PATCH] Do not use external nodes by default --- abf/model.py | 61 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 20 deletions(-) diff --git a/abf/model.py b/abf/model.py index a908f9b..b3fa1db 100644 --- a/abf/model.py +++ b/abf/model.py @@ -558,7 +558,7 @@ class BuildList(Model): self.arch.name, self.status_string) update_types = ['security', 'bugfix', 'enhancement', 'recommended', 'newpackage'] - external_nodes_vals = ['everything', 'owned'] + external_nodes_vals = ['none', 'everything', 'owned'] auto_publish_statuses = ['default', 'none', 'testing'] @staticmethod def new_build_task(models, @@ -577,25 +577,46 @@ class BuildList(Model): use_extra_tests, extra_build_lists, external_nodes): - DATA = { - 'project_id': project.id, - 'commit_hash': commit_hash, - 'update_type': update_type, - 'save_to_repository_id': save_to_repository.id, - 'build_for_platform_id': None, - 'auto_publish_status': auto_publish_status, - 'project_version': project_version, - 'auto_create_container': auto_create_container, - 'use_cached_chroot': cached_chroot, - 'save_buildroot': save_chroot, - 'arch_id': None, - 'include_repos': [], - 'extra_repositories': [], - 'extra_build_lists': extra_build_lists, - 'include_testing_subrepository': include_testing_subrepo, - 'use_extra_tests': use_extra_tests, - 'external_nodes': external_nodes - } + if external_nodes == 'none': + DATA = { + 'project_id': project.id, + 'commit_hash': commit_hash, + 'update_type': update_type, + 'save_to_repository_id': save_to_repository.id, + 'build_for_platform_id': None, + 'auto_publish_status': auto_publish_status, + 'project_version': project_version, + 'auto_create_container': auto_create_container, + 'use_cached_chroot': cached_chroot, + 'save_buildroot': save_chroot, + 'arch_id': None, + 'include_repos': [], + 'extra_repositories': [], + 'extra_build_lists': extra_build_lists, + 'include_testing_subrepository': include_testing_subrepo, + 'use_extra_tests': use_extra_tests + } + else: + DATA = { + 'project_id': project.id, + 'commit_hash': commit_hash, + 'update_type': update_type, + 'save_to_repository_id': save_to_repository.id, + 'build_for_platform_id': None, + 'auto_publish_status': auto_publish_status, + 'project_version': project_version, + 'auto_create_container': auto_create_container, + 'use_cached_chroot': cached_chroot, + 'save_buildroot': save_chroot, + 'arch_id': None, + 'include_repos': [], + 'extra_repositories': [], + 'extra_build_lists': extra_build_lists, + 'include_testing_subrepository': include_testing_subrepo, + 'use_extra_tests': use_extra_tests, + 'external_nodes': external_nodes + } + build_platforms = {} if not skip_personal and string.find(save_to_repository.platform.name,"_personal") > 0: