Merge "Don't print message in payload if None"

This commit is contained in:
Zuul 2018-12-06 15:05:38 +00:00 committed by Gerrit Code Review
commit 13c7b0a0ec
1 changed files with 12 additions and 8 deletions

View File

@ -52,8 +52,9 @@ def deploy(log, clients, **workflow_input):
for payload in base.wait_for_messages(workflow_client, ws, execution,
600):
status = payload.get('status', 'RUNNING')
if 'message' in payload and status == "RUNNING":
print(payload['message'])
message = payload.get('message')
if message and status == "RUNNING":
print(message)
if payload['status'] != "SUCCESS":
log.info(pprint.pformat(payload))
@ -320,8 +321,9 @@ def config_download_export(clients, **workflow_input):
for payload in base.wait_for_messages(workflow_client, ws, execution,
_WORKFLOW_TIMEOUT):
if 'message' in payload:
print(payload['message'])
message = payload.get('message')
if message:
print(message)
if payload['status'] == 'SUCCESS':
return payload['tempurl']
@ -362,8 +364,9 @@ def get_deployment_status(clients, **workflow_input):
for payload in base.wait_for_messages(workflow_client, ws, execution,
_WORKFLOW_TIMEOUT):
if 'message' in payload:
print(payload['message'])
message = payload.get('message')
if message:
print(message)
if payload['status'] == 'SUCCESS':
return payload['deployment_status']
@ -413,7 +416,8 @@ def get_deployment_failures(clients, **workflow_input):
**workflow_input
)
if result.get('message', ''):
print(result['message'])
message = result.get('message')
if message:
print(message)
return result['failures']