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

Only check minion version if a specific commit is passed.

Browse source
This commit is contained in:
Pedro Algarvio 2014-04-13 12:49:00 +01:00
parent 857078e68a
commit e85bc09a63
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/jenkins.py
View file

@ -343,7 +343,7 @@ def run(opts):
sys.stdout.flush()
time.sleep(5)
if opts.test_git_commit is not None:
if opts.bootstrap_salt_commit is not None:
# Let's find out if the installed version matches the passed in pillar
# information
sys.stdout.write('Grabbing bootstrapped minion version information ... ')
@ -372,9 +372,9 @@ def run(opts):
sys.exit(retcode)
version_info = json.loads(stdout.strip())
if not version_info[vm_name].endswith(opts.test_git_commit[:7]):
if not version_info[vm_name].endswith(opts.bootstrap_salt_commit[:7]):
print('\nThe boostrapped minion version commit does not match the desired commit:')
print(' {0!r} does not end with {1!r}'.format(version_info[vm_name], opts.test_git_commit[:7]))
print(' {0!r} does not end with {1!r}'.format(version_info[vm_name], opts.bootstrap_salt_commit[:7]))
sys.stdout.flush()
if opts.clean and 'JENKINS_SALTCLOUD_VM_NAME' not in os.environ:
delete_vm(opts)