External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-25 04:45:03 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix bug with non-sliced JT job spawn

Browse Source
This commit is contained in:
AlanCoding
2018-11-13 14:40:27 -05:00
parent 3bb91b20d0
commit 5443e10697
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/models/jobs.py
View File

@@ -338,6 +338,9 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
kwargs['_parent_field_name'] = "job_template" kwargs['_parent_field_name'] = "job_template"
kwargs.setdefault('_eager_fields', {}) kwargs.setdefault('_eager_fields', {})
kwargs['_eager_fields']['is_sliced_job'] = True kwargs['_eager_fields']['is_sliced_job'] = True
elif prevent_slicing:
kwargs.setdefault('_eager_fields', {})
kwargs['_eager_fields'].setdefault('job_slice_count', 1)
job = super(JobTemplate, self).create_unified_job(**kwargs) job = super(JobTemplate, self).create_unified_job(**kwargs)
if slice_event: if slice_event:
try: try:

18
awx/main/tests/functional/api/test_job_runtime_params.py
View File

@@ -561,11 +561,12 @@ def test_callback_accept_prompted_extra_var(mocker, survey_spec_factory, job_tem
dict(extra_vars={"job_launch_var": 3, "survey_var": 4}, host_config_key="foo"), dict(extra_vars={"job_launch_var": 3, "survey_var": 4}, host_config_key="foo"),
admin_user, expect=201, format='json') admin_user, expect=201, format='json')
assert UnifiedJobTemplate.create_unified_job.called assert UnifiedJobTemplate.create_unified_job.called
assert UnifiedJobTemplate.create_unified_job.call_args == ({ call_args = UnifiedJobTemplate.create_unified_job.call_args[1]
call_args.pop('_eager_fields', None) # internal purposes
assert call_args == {
'extra_vars': {'survey_var': 4, 'job_launch_var': 3}, 'extra_vars': {'survey_var': 4, 'job_launch_var': 3},
'_eager_fields': {'launch_type': 'callback'}, 'limit': 'single-host'
'limit': 'single-host'}, }
)
mock_job.signal_start.assert_called_once() mock_job.signal_start.assert_called_once()
@@ -587,10 +588,11 @@ def test_callback_ignore_unprompted_extra_var(mocker, survey_spec_factory, job_t
dict(extra_vars={"job_launch_var": 3, "survey_var": 4}, host_config_key="foo"), dict(extra_vars={"job_launch_var": 3, "survey_var": 4}, host_config_key="foo"),
admin_user, expect=201, format='json') admin_user, expect=201, format='json')
assert UnifiedJobTemplate.create_unified_job.called assert UnifiedJobTemplate.create_unified_job.called
assert UnifiedJobTemplate.create_unified_job.call_args == ({ call_args = UnifiedJobTemplate.create_unified_job.call_args[1]
'_eager_fields': {'launch_type': 'callback'}, call_args.pop('_eager_fields', None) # internal purposes
'limit': 'single-host'}, assert call_args == {
) 'limit': 'single-host'
}
mock_job.signal_start.assert_called_once() mock_job.signal_start.assert_called_once()

12
awx/main/tests/functional/models/test_job.py
View File

@@ -18,6 +18,18 @@ def test_awx_virtualenv_from_settings(inventory, project, machine_credential):
assert job.ansible_virtualenv_path == '/venv/ansible' assert job.ansible_virtualenv_path == '/venv/ansible'
@pytest.mark.django_db
def test_prevent_slicing():
jt = JobTemplate.objects.create(
name='foo',
job_slice_count=4
)
job = jt.create_unified_job(_prevent_slicing=True)
assert job.job_slice_count == 1
assert job.job_slice_number == 0
assert isinstance(job, Job)
@pytest.mark.django_db @pytest.mark.django_db
def test_awx_custom_virtualenv(inventory, project, machine_credential): def test_awx_custom_virtualenv(inventory, project, machine_credential):
jt = JobTemplate.objects.create( jt = JobTemplate.objects.create(