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

Change Demo Project status to successful

Browse Source
This commit is contained in:
Alan Rominger
2022-05-11 11:19:02 -04:00
parent 1c9b4af61d
commit bca6e00e37
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/management/commands/create_preload_data.py
View File

@@ -32,8 +32,10 @@ class Command(BaseCommand):
name='Demo Project', name='Demo Project',
scm_type='git', scm_type='git',
scm_url='https://github.com/ansible/ansible-tower-samples', scm_url='https://github.com/ansible/ansible-tower-samples',
scm_update_on_launch=True,
scm_update_cache_timeout=0, scm_update_cache_timeout=0,
status='successful',
scm_revision='347e44fea036c94d5f60e544de006453ee5c71ad',
playbook_files=['hello_world.yml'],
) )
p.organization = o p.organization = o

8
awx/main/models/projects.py
View File

@@ -354,7 +354,7 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin, CustomVirtualEn
# If update_fields has been specified, add our field names to it, # If update_fields has been specified, add our field names to it,
# if it hasn't been specified, then we're just doing a normal save. # if it hasn't been specified, then we're just doing a normal save.
update_fields = kwargs.get('update_fields', []) update_fields = kwargs.get('update_fields', [])
skip_update = bool(kwargs.pop('skip_update', False)) self._skip_update = bool(kwargs.pop('skip_update', False))
# Create auto-generated local path if project uses SCM. # Create auto-generated local path if project uses SCM.
if self.pk and self.scm_type and not self.local_path.startswith('_'): if self.pk and self.scm_type and not self.local_path.startswith('_'):
slug_name = slugify(str(self.name)).replace(u'-', u'_') slug_name = slugify(str(self.name)).replace(u'-', u'_')
@@ -372,14 +372,16 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin, CustomVirtualEn
from awx.main.signals import disable_activity_stream from awx.main.signals import disable_activity_stream
with disable_activity_stream(): with disable_activity_stream():
self.save(update_fields=update_fields) self.save(update_fields=update_fields, skip_update=self._skip_update)
# If we just created a new project with SCM, start the initial update. # If we just created a new project with SCM, start the initial update.
# also update if certain fields have changed # also update if certain fields have changed
relevant_change = any(pre_save_vals.get(fd_name, None) != self._prior_values_store.get(fd_name, None) for fd_name in self.FIELDS_TRIGGER_UPDATE) relevant_change = any(pre_save_vals.get(fd_name, None) != self._prior_values_store.get(fd_name, None) for fd_name in self.FIELDS_TRIGGER_UPDATE)
if (relevant_change or new_instance) and (not skip_update) and self.scm_type: if (relevant_change or new_instance) and (not self._skip_update) and self.scm_type:
self.update() self.update()
def _get_current_status(self): def _get_current_status(self):
if getattr(self, '_skip_update', False):
return self.status
if self.scm_type: if self.scm_type:
if self.current_job and self.current_job.status: if self.current_job and self.current_job.status:
return self.current_job.status return self.current_job.status