valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't ignore the workspace path option

Browse Source
This commit is contained in:
Pedro Algarvio 2014-01-05 00:10:24 +00:00
parent d4636b020c
commit d2bcd53e37
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/jenkins.py
View File

@ -91,10 +91,12 @@ def download_unittest_reports(options):
print('Downloading remote unittest reports...') print('Downloading remote unittest reports...')
sys.stdout.flush() sys.stdout.flush()
if os.path.isdir('xml-test-reports'): workspace = options.workspace
shutil.rmtree('xml-test-reports') xml_reports_path = os.path.join(workspace, 'xml-test-reports')
if os.path.isdir(xml_reports_path):
shutil.rmtree(xml_reports_path)
os.makedirs('xml-test-reports') os.makedirs(xml_reports_path)
cmds = ( cmds = (
'salt {0} archive.tar zcvf /tmp/xml-test-reports.tar.gz \'*.xml\' cwd=/tmp/xml-unitests-output/', 'salt {0} archive.tar zcvf /tmp/xml-test-reports.tar.gz \'*.xml\' cwd=/tmp/xml-unitests-output/',
@ -105,7 +107,6 @@ def download_unittest_reports(options):
) )
vm_name = options.download_unittest_reports vm_name = options.download_unittest_reports
workspace = options.workspace
for cmd in cmds: for cmd in cmds:
cmd = cmd.format(vm_name, workspace) cmd = cmd.format(vm_name, workspace)
print('Running CMD: {0}'.format(cmd)) print('Running CMD: {0}'.format(cmd))