report task error message if no errors were found in steps

* CLOUDBLD-12659 Signed-off-by: Robert Cerven <[email protected]>
containerbuildsystem · Apr 12, 2023 · ad6da58 · ad6da58
1 parent 8d7d7fa
commit ad6da58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/osbs/tekton.py b/osbs/tekton.py
@@ -553,6 +553,7 @@ def get_error_message(self):
 
         for _, stats in sorted_tasks:
             task_name = stats['pipelineTaskName']
+            got_task_error = False
             if stats['status']['conditions'][0]['reason'] == 'Succeeded':
                 continue
 
@@ -570,13 +571,15 @@ def get_error_message(self):
                                     if message['key'] == 'task_result':
                                         err_message += f"Error in {task_name}: " \
                                                        f"{message['value']};\n"
+                                got_task_error = True
                                 continue
                             except Exception as e:
                                 logger.info("failed to get error message: %s", repr(e))
                                 continue
 
-                    err_message += f"Error in {task_name}: " \
-                                   f"{stats['status']['conditions'][0]['message']};\n"
+            if not got_task_error:
+                err_message += f"Error in {task_name}: " \
+                               f"{stats['status']['conditions'][0]['message']};\n"
 
         if not err_message:
             if pipeline_error:

diff --git a/tests/test_tekton.py b/tests/test_tekton.py
@@ -618,7 +618,7 @@ def test_get_info(self, pipeline_run, get_json):
                          }
                      }},
           'metadata': {}},
-         "pipeline err message1;"),
+         "Error in binary-build-task1: message2;\n"),
 
         # taskRuns in status, with steps and failed without terminated key
         ({'status': {'conditions': [{'reason': 'reason1'}],