External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-08-01 02:19:55 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix: prefer scm_revision as the cache_id if available (#16564)

Browse Source 
* fix: prefer scm_revision as the cache_id if available

* add tests

* fix: make sure galaxy requirements are always updated when a new revision is pulled

* make sure existing project cache id is used when available

---------

Co-authored-by: Liam Allen <lallen@redhat.com>
This commit is contained in:
Peter Braun
2026-07-31 11:20:18 +02:00
committed by GitHub
parent 10f2f11fe2
commit bee4470fb9
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,13 +450,14 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin, CustomVirtualEn
@property @property
def cache_id(self): def cache_id(self):
"""This gives the folder name where collections and roles will be saved to so it does not re-download # Prefer scm_revision as the cache key if available. This guarantees that project changes are tracked correctly
# even over multiple nodes. The scm_revision is a hex string and thus safe to be used as a directory name.
if self.scm_revision:
return self.scm_revision
Normally we want this to track with the last update, because every update should pull new content. # If no scm_revision is available (e.g. non-scm projects), use these. current_job_id and last_job_id are global
This does not count sync jobs, but sync jobs do not update last_job or current_job anyway. # IDs in the database. This means that when a project sync runs on one node, all other nodes become outdated,
If cleanup_jobs deletes the last jobs, then we can fallback to using any given heuristic related # resulting in unnecessary re-syncs.
to the last job ran.
"""
if self.current_job_id: if self.current_job_id:
return str(self.current_job_id) return str(self.current_job_id)
elif self.last_job_id: elif self.last_job_id:
@@ -638,7 +639,7 @@ class ProjectUpdate(UnifiedJob, ProjectOptions, JobNotificationMixin, TaskManage
@property @property
def cache_id(self): def cache_id(self):
if self.branch_override or self.job_type == 'check' or (not self.project): if self.branch_override or (not self.project):
return str(self.id) # causes it to not use the cache, basically return str(self.id) # causes it to not use the cache, basically
return self.project.cache_id return self.project.cache_id

4
awx/main/tasks/jobs.py
View File

@@ -885,7 +885,9 @@ class SourceControlMixin(BaseTask):
# Determine whether or not this project sync needs to populate the cache for Ansible content, roles and collections # Determine whether or not this project sync needs to populate the cache for Ansible content, roles and collections
has_cache = os.path.exists(os.path.join(project.get_cache_path(), project.cache_id)) has_cache = os.path.exists(os.path.join(project.get_cache_path(), project.cache_id))
# Galaxy requirements are not supported for manual projects # Galaxy requirements are not supported for manual projects
if project.scm_type and ((not has_cache) or branch_override): # If a source update is scheduled, always include roles/collections because
# the new revision may have different requirements.
if project.scm_type and ((not has_cache) or branch_override or source_update_tag in sync_needs):
sync_needs.extend(['install_roles', 'install_collections']) sync_needs.extend(['install_roles', 'install_collections'])
return sync_needs return sync_needs