From 659d8d51d57464013009b953b2cc35abe1b0d788 Mon Sep 17 00:00:00 2001
From: qweqweasdasd <qweqweasdasd@infn.it>
Date: Mon, 25 Jul 2022 19:44:09 +0200
Subject: [PATCH] Fix python command line
---
tasks/main.yml | 6 +++---
utils/script.py | 6 +++++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index 7a600c7..f54dc14 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 7f57a24..aafada7 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
--
GitLab