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

Remove compound matching from jenkins.py

Browse Source
This commit is contained in:
rallytime 2014-08-20 09:49:49 -06:00
parent 7ea0328fef
commit 286de2466d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/jenkins.py
View File

@ -76,7 +76,7 @@ def build_minion_target(options, vm_name):
for grain in options.grain_target:
target += ' and G@{0}'.format(grain)
if options.grain_target:
return '-C "{0}"'.format(target)
return '"{0}"'.format(target)
return target
@ -185,7 +185,7 @@ def download_unittest_reports(options):
'salt {0} archive.tar zcvf /tmp/xml-test-reports.tar.gz \'*.xml\' cwd=/tmp/xml-unitests-output/',
'salt {0} cp.push /tmp/xml-test-reports.tar.gz',
'mv -f /var/cache/salt/master/minions/{1}/files/tmp/xml-test-reports.tar.gz {2} && '
'tar zxvf {2}/xml-test-reports.tar.gz -C {2}/xml-test-reports && '
'tar zxvf {2}/xml-test-reports.tar.gz {2}/xml-test-reports && '
'rm -f {2}/xml-test-reports.tar.gz'
)