saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Make salt-cloud run our testrun state to get a streamed output"

Browse source 
This reverts commit d8b011d103.
This commit is contained in:
Pedro Algarvio 2013-08-17 06:06:51 +01:00
parent 09cb137ec7
commit d66609c630
1 changed files with 34 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
tests/jenkins.py
View file

@ -42,12 +42,33 @@ def run(platform, provider, commit, clean):
RUN!
'''
htag = hashlib.md5(str(random.randint(1, 100000000))).hexdigest()[:6]
vm_name = 'ZZZ-{0}-{1}'.format(platform, htag)
cmd = ('salt-cloud -l debug --script-args "-D -n git {0}" '
'--start-action "-t 1800 state.sls testrun '
'pillar=\'{{git_commit: {0}}}\' --no-color" -p {1}_{2} {3}'.format(
commit, provider, platform, vm_name)
)
vm_name = 'ZZZ{0}{1}'.format(platform, htag)
cmd = 'salt-cloud -l debug --script-args "-D -n git {0}" -p {1}_{2} {3}'.format(
commit, provider, platform, vm_name)
print('Running CMD: {0}'.format(cmd))
sys.stdout.flush()
proc = NonBlockingPopen(
cmd,
shell=True,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
stream_stds=True
)
proc.poll_and_read_until_finish()
proc.communicate()
if proc.returncode > 0:
print('Failed to bootstrap VM. Exit code: {0}'.format(proc.returncode))
sys.stdout.flush()
sys.exit(proc.returncode)
print('VM Bootstrapped. Exit code: {0}'.format(proc.returncode))
sys.stdout.flush()
# Run tests here
cmd = 'salt -t 1800 {0} state.sls testrun pillar="{{git_commit: {1}}}" --no-color'.format(
vm_name,
commit)
print('Running CMD: {0}'.format(cmd))
sys.stdout.flush()
@ -60,10 +81,13 @@ def run(platform, provider, commit, clean):
)
proc.poll_and_read_until_finish()
stdout, stderr = proc.communicate()
if proc.returncode > 0:
print('Failed to bootstrap VM. Exit code: {0}'.format(proc.returncode))
sys.stdout.flush()
sys.exit(proc.returncode)
if stderr:
print(stderr)
if stdout:
print(stdout)
sys.stdout.flush()
try:
match = re.search(r'Test Suite Exit Code: (?P<exitcode>[\d]+)', stdout)
@ -81,50 +105,6 @@ def run(platform, provider, commit, clean):
# Anything else, raise the exception
raise
print('VM Bootstrapped. Exit code: {0}'.format(proc.returncode))
sys.stdout.flush()
#
# # Run tests here
# cmd = 'salt -t 1800 {0} state.sls testrun pillar="{{git_commit: {1}}}" --no-color'.format(
# vm_name,
# commit)
# print('Running CMD: {0}'.format(cmd))
# sys.stdout.flush()
#
# proc = NonBlockingPopen(
# cmd,
# shell=True,
# stdout=subprocess.PIPE,
# stderr=subprocess.PIPE,
# stream_stds=True
# )
# proc.poll_and_read_until_finish()
# stdout, stderr = proc.communicate()
#
# if stderr:
# print(stderr)
# if stdout:
# print(stdout)
#
# sys.stdout.flush()
#
# try:
# match = re.search(r'Test Suite Exit Code: (?P<exitcode>[\d]+)', stdout)
# retcode = int(match.group('exitcode'))
# except AttributeError:
# # No regex matching
# retcode = 1
# except ValueError:
# # Not a number!?
# retcode = 1
# except TypeError:
# # No output!?
# retcode = 1
# if stdout:
# # Anything else, raise the exception
# raise
# Clean up the vm
if clean:
cmd = 'salt-cloud -d {0} -y'.format(vm_name)