External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix up job run types so that we aren't auto-starting new jobs. Fix up

Browse Source 
job dependency generator to call the right new methods for generating
inventory and project updates
This commit is contained in:
Matthew Jones
2014-03-25 15:21:30 -04:00
parent bb630fddbc
commit 03249e59f3
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -309,11 +309,11 @@ class Job(UnifiedJob, JobOptions):
if obj.inventory_source in inventory_sources:
inventory_sources_found.append(obj.inventory_source)
if not project_found and self.project.scm_update_on_launch:
dependencies.append(self.project.project_updates.create())
dependencies.append(self.project.create_project_update(launch_type='dependency'))
if inventory_sources.count(): # and not has_setup_failures? Probably handled as an error scenario in the task runner
for source in inventory_sources:
if not source in inventory_sources_found:
dependencies.append(source.inventory_updates.create())
dependencies.append(source.create_inventory_update(launch_type='dependency'))
return dependencies
def signal_start(self, **kwargs):
@@ -331,6 +331,7 @@ class Job(UnifiedJob, JobOptions):
self.start_args = json_args
self.save()
self.start_args = encrypt_field(self, 'start_args')
self.status = 'pending'
self.save()
# notify_task_runner.delay(dict(task_type="ansible_playbook", id=self.id))
return True