Merge "Move tmpdir into work root"
This commit is contained in:
commit
9a74ecd3aa
|
@ -315,6 +315,7 @@ class JobDir(object):
|
||||||
# <project>
|
# <project>
|
||||||
# logs
|
# logs
|
||||||
# job-output.txt
|
# job-output.txt
|
||||||
|
# tmp
|
||||||
# results.json
|
# results.json
|
||||||
self.keep = keep
|
self.keep = keep
|
||||||
if root:
|
if root:
|
||||||
|
@ -329,6 +330,12 @@ class JobDir(object):
|
||||||
os.makedirs(self.src_root)
|
os.makedirs(self.src_root)
|
||||||
self.log_root = os.path.join(self.work_root, 'logs')
|
self.log_root = os.path.join(self.work_root, 'logs')
|
||||||
os.makedirs(self.log_root)
|
os.makedirs(self.log_root)
|
||||||
|
# Create local tmp directory
|
||||||
|
# NOTE(tobiash): This must live within the work root as it can be used
|
||||||
|
# by ansible for temporary files which are path checked in untrusted
|
||||||
|
# jobs.
|
||||||
|
self.local_tmp = os.path.join(self.work_root, 'tmp')
|
||||||
|
os.makedirs(self.local_tmp)
|
||||||
self.ansible_root = os.path.join(self.root, 'ansible')
|
self.ansible_root = os.path.join(self.root, 'ansible')
|
||||||
os.makedirs(self.ansible_root)
|
os.makedirs(self.ansible_root)
|
||||||
self.trusted_root = os.path.join(self.root, 'trusted')
|
self.trusted_root = os.path.join(self.root, 'trusted')
|
||||||
|
@ -1384,8 +1391,7 @@ class AnsibleJob(object):
|
||||||
with open(jobdir_playbook.ansible_config, 'w') as config:
|
with open(jobdir_playbook.ansible_config, 'w') as config:
|
||||||
config.write('[defaults]\n')
|
config.write('[defaults]\n')
|
||||||
config.write('inventory = %s\n' % self.jobdir.inventory)
|
config.write('inventory = %s\n' % self.jobdir.inventory)
|
||||||
config.write('local_tmp = %s/local_tmp\n' %
|
config.write('local_tmp = %s\n' % self.jobdir.local_tmp)
|
||||||
self.jobdir.ansible_cache_root)
|
|
||||||
config.write('retry_files_enabled = False\n')
|
config.write('retry_files_enabled = False\n')
|
||||||
config.write('gathering = smart\n')
|
config.write('gathering = smart\n')
|
||||||
config.write('fact_caching = jsonfile\n')
|
config.write('fact_caching = jsonfile\n')
|
||||||
|
@ -1468,6 +1474,7 @@ class AnsibleJob(object):
|
||||||
env_copy['ARA_LOG_CONFIG'] = self.jobdir.logging_json
|
env_copy['ARA_LOG_CONFIG'] = self.jobdir.logging_json
|
||||||
env_copy['ZUUL_JOB_LOG_CONFIG'] = self.jobdir.logging_json
|
env_copy['ZUUL_JOB_LOG_CONFIG'] = self.jobdir.logging_json
|
||||||
env_copy['ZUUL_JOBDIR'] = self.jobdir.root
|
env_copy['ZUUL_JOBDIR'] = self.jobdir.root
|
||||||
|
env_copy['TMP'] = self.jobdir.local_tmp
|
||||||
pythonpath = env_copy.get('PYTHONPATH')
|
pythonpath = env_copy.get('PYTHONPATH')
|
||||||
if pythonpath:
|
if pythonpath:
|
||||||
pythonpath = [pythonpath]
|
pythonpath = [pythonpath]
|
||||||
|
|
Loading…
Reference in New Issue