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

Remove project update vars no longer used

Browse Source
This commit is contained in:
AlanCoding
2020-07-20 14:00:24 -04:00
parent fefab89815
commit 300d54864d
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/tasks.py
View File

@@ -2167,9 +2167,6 @@ class RunProjectUpdate(BaseTask):
'roles_enabled': settings.AWX_ROLES_ENABLED, 'roles_enabled': settings.AWX_ROLES_ENABLED,
'collections_enabled': settings.AWX_COLLECTIONS_ENABLED, 'collections_enabled': settings.AWX_COLLECTIONS_ENABLED,
}) })
if project_update.job_type != 'check' and self.job_private_data_dir:
extra_vars['collections_destination'] = os.path.join(self.job_private_data_dir, 'requirements_collections')
extra_vars['roles_destination'] = os.path.join(self.job_private_data_dir, 'requirements_roles')
# apply custom refspec from user for PR refs and the like # apply custom refspec from user for PR refs and the like
if project_update.scm_refspec: if project_update.scm_refspec:
extra_vars['scm_refspec'] = project_update.scm_refspec extra_vars['scm_refspec'] = project_update.scm_refspec

4
awx/playbooks/project_update.yml
View File

@@ -3,7 +3,7 @@
# projects_root: Global location for caching project checkouts and roles and collections # projects_root: Global location for caching project checkouts and roles and collections
# should not have trailing slash on end # should not have trailing slash on end
# local_path: Path within projects_root to use for this project # local_path: Path within projects_root to use for this project
# project_path: projects_root/local_path # project_path: A simple join of projects_root/local_path folders
# scm_url: https://server/repo # scm_url: https://server/repo
# insights_url: Insights service URL (from configuration) # insights_url: Insights service URL (from configuration)
# scm_branch: branch/tag/revision (HEAD if unset) # scm_branch: branch/tag/revision (HEAD if unset)
@@ -14,8 +14,6 @@
# scm_refspec: a refspec to fetch in addition to obtaining version # scm_refspec: a refspec to fetch in addition to obtaining version
# roles_enabled: Value of the global setting to enable roles downloading # roles_enabled: Value of the global setting to enable roles downloading
# collections_enabled: Value of the global setting to enable collections downloading # collections_enabled: Value of the global setting to enable collections downloading
# roles_destination: Path to save roles from galaxy to
# collections_destination: Path to save collections from galaxy to
# awx_version: Current running version of the awx or tower as a string # awx_version: Current running version of the awx or tower as a string
# awx_license_type: "open" for AWX; else presume Tower # awx_license_type: "open" for AWX; else presume Tower