Djam/abf-console-client-src
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/abf-console-client-src.git synced 2025-02-23 18:02:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not use external nodes by default

Browse source
This commit is contained in:
Denis Silakov 2015-05-05 11:55:50 +03:00
parent 1eb71b6558
commit b9b5605da3
1 changed files with 41 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
abf/model.py
View file

@ -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: