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

Merge pull request #8671 from AlanCoding/weird_fail

Browse Source 
Avoid copies made from failed updates

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-11-25 15:58:51 +00:00
committed by GitHub
parent 9921887ce8 44949b73cf
commit 6f43784c47
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/tasks.py
View File

@@ -2417,9 +2417,10 @@ class RunProjectUpdate(BaseTask):
shutil.rmtree(stage_path) # cannot trust content update produced shutil.rmtree(stage_path) # cannot trust content update produced
if self.job_private_data_dir: if self.job_private_data_dir:
# copy project folder before resetting to default branch if status == 'successful':
# because some git-tree-specific resources (like submodules) might matter # copy project folder before resetting to default branch
self.make_local_copy(instance, self.job_private_data_dir) # because some git-tree-specific resources (like submodules) might matter
self.make_local_copy(instance, self.job_private_data_dir)
if self.original_branch: if self.original_branch:
# for git project syncs, non-default branches can be problems # for git project syncs, non-default branches can be problems
# restore to branch the repo was on before this run # restore to branch the repo was on before this run