diff --git a/tasks/main.yml b/tasks/main.yml index 7a600c75249f0aa1a7e85629a980bfd12c26bbff..f54dc141280b9252c07a24dbd33956125c444464 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -92,9 +92,9 @@ - name: Get scan outputs (if successful) assert: that: - - deployment.global == 'CREATE_COMPLETE' - fail_msg: "TEST FAILED - deployment uuid: {{ deployment.uuid }}, status: {{ deployment.status }}" - success_msg: "TEST PASSED - deployment uuid: {{ deployment.uuid }}, status: {{ deployment.status }}, outputs: {{ deployment.outputs }}" + - deployment.global == 'OK' + fail_msg: "SCAN FAILED - deployment uuid: {{ deployment.uuid }}, global_severity: {{ deployment.global_severity }}" + success_msg: "SCAN PASSED - deployment uuid: {{ deployment.uuid }}, global_severity: {{ deployment.global_severity }}, outputs: {{ deployment.outputs }}" when: paas_ci_test_step == 'scan' diff --git a/utils/script.py b/utils/script.py index 7f57a240ba2b4bc5c6c916b8c66f2422d281c547..aafada78849f07e80997894835dc026a4d0fae7b 100644 --- a/utils/script.py +++ b/utils/script.py @@ -348,7 +348,11 @@ def process_global_severity(severities): if dict_severity[sev] > old_num_severity: old_num_severity = dict_severity[sev] global_sev = sev - severities['global'] = global_sev + severities['global_severity'] = global_sev + if global_sev == "Log" or global_sev == "Low": + severities['global'] = "OK" + else: + severities['global'] = "NOK" return severities