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

Merge pull request #599 from wwitzel3/release_3.2.2

Browse Source 
Fix git project sync bug.
This commit is contained in:
Wayne Witzel III
2017-11-30 11:22:29 -05:00
committed by GitHub
parent fc4b02b79f ed28faa3db
commit f3310236e4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tasks.py
View File

@@ -1026,9 +1026,6 @@ class RunJob(BaseTask):
plugin_path = ':'.join(plugin_dirs) plugin_path = ':'.join(plugin_dirs)
env = super(RunJob, self).build_env(job, **kwargs) env = super(RunJob, self).build_env(job, **kwargs)
env = self.add_ansible_venv(env, add_awx_lib=kwargs.get('isolated', False)) env = self.add_ansible_venv(env, add_awx_lib=kwargs.get('isolated', False))
# give ansible a hint about the intended tmpdir to work around issues
# like https://github.com/ansible/ansible/issues/30064
env['TMPDIR'] = settings.AWX_PROOT_BASE_PATH
# Set environment variables needed for inventory and job event # Set environment variables needed for inventory and job event
# callbacks to work. # callbacks to work.
env['JOB_ID'] = str(job.pk) env['JOB_ID'] = str(job.pk)
@@ -1356,6 +1353,9 @@ class RunProjectUpdate(BaseTask):
env['ANSIBLE_ASK_PASS'] = str(False) env['ANSIBLE_ASK_PASS'] = str(False)
env['ANSIBLE_ASK_SUDO_PASS'] = str(False) env['ANSIBLE_ASK_SUDO_PASS'] = str(False)
env['DISPLAY'] = '' # Prevent stupid password popup when running tests. env['DISPLAY'] = '' # Prevent stupid password popup when running tests.
# give ansible a hint about the intended tmpdir to work around issues
# like https://github.com/ansible/ansible/issues/30064
env['TMP'] = settings.AWX_PROOT_BASE_PATH
return env return env
def _build_scm_url_extra_vars(self, project_update, **kwargs): def _build_scm_url_extra_vars(self, project_update, **kwargs):