openstack
/
tripleo-validations
Code Issues Proposed changes

Merge "Get UUID from ansible environment variables" into stable/train

This commit is contained in:
Zuul 2020-08-25 07:36:29 +00:00 committed by Gerrit Code Review
parent 015dab217e c761798771
commit e66bac6b73
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
callback_plugins/validation_json.py
View File

@ -20,7 +20,7 @@ __metaclass__ = type
import datetime import datetime
import json import json
import time import time
import os.path import os
from functools import partial from functools import partial
@ -75,7 +75,8 @@ class CallbackModule(CallbackBase):
'host': play.get_name(), 'host': play.get_name(),
'validation_id': self.env['playbook_name'], 'validation_id': self.env['playbook_name'],
'validation_path': self.env['playbook_path'], 'validation_path': self.env['playbook_path'],
'id': str(play._uuid), 'id': (os.getenv('ANSIBLE_UUID') if os.getenv('ANSIBLE_UUID')
else str(play._uuid)),
'duration': { 'duration': {
'start': current_time() 'start': current_time()
} }
@ -147,7 +148,8 @@ class CallbackModule(CallbackBase):
log_file = "{}/{}_{}_{}.json".format( log_file = "{}/{}_{}_{}.json".format(
VALIDATIONS_LOG_DIR, VALIDATIONS_LOG_DIR,
self.results[0].get('play').get('id'), (os.getenv('ANSIBLE_UUID') if os.getenv('ANSIBLE_UUID') else
self.results[0].get('play').get('id')),
self.env['playbook_name'], self.env['playbook_name'],
self.current_time) self.current_time)

1
doc/source/_exts/generate_validations_doc.py
View File

@ -103,7 +103,6 @@ Role documentation
name=validation['name'], name=validation['name'],
desc=validation['description'], desc=validation['description'],
groups=', '.join(validation['groups']), groups=', '.join(validation['groups']),
metadata=format_dict(validation['metadata']),
hosts=validation['hosts'], hosts=validation['hosts'],
parameters=format_dict(validation['parameters']), parameters=format_dict(validation['parameters']),
roles=validation['roles'] roles=validation['roles']