Merge pull request ClickHouse#78659 from ClickHouse/ci_improve_job_summary_in_info

CI: Improve job summary in report

Author: maxknv

ci/jobs/build_clickhouse.py

@@ -211,9 +211,7 @@ def main():
         )
         res = results[-1].is_ok()
 
-    Result.create_from(results=results, stopwatch=stop_watch).add_job_summary_to_info(
-        with_local_run_command=True
-    ).complete_job()
+    Result.create_from(results=results, stopwatch=stop_watch).complete_job()
 
 
 if __name__ == "__main__":

ci/jobs/check_style.py

@@ -392,6 +392,4 @@ def parse_args():
             )
         )
 
-    Result.create_from(results=results).add_job_summary_to_info(
-        with_local_run_command=True, with_test_in_run_command=True
-    ).complete_job()
+    Result.create_from(results=results).complete_job()

ci/jobs/fast_test.py

@@ -267,8 +267,6 @@ def main():
 
     Result.create_from(
         results=results, stopwatch=stop_watch, files=attach_files
-    ).add_job_summary_to_info(
-        with_local_run_command=True, with_test_in_run_command=True
     ).complete_job()
 
 

ci/jobs/performance_tests.py

@@ -602,7 +602,7 @@ def too_many_slow(msg):
 
     Result.create_from(
         results=results, stopwatch=stop_watch, files=files_to_attach, info=message
-    ).add_job_summary_to_info(with_local_run_command=True).complete_job()
+    ).complete_job()
 
 
 if __name__ == "__main__":

ci/jobs/unit_tests_job.py

@@ -2,6 +2,5 @@
 
 if __name__ == "__main__":
     Result.from_gtest_run(
-        name="",
         unit_tests_path="./ci/tmp/unit_tests_dbms",
-    ).add_job_summary_to_info(with_local_run_command=True).complete_job()
+    ).complete_job()

ci/praktika/docker.py

@@ -94,11 +94,8 @@ def merge_manifest(
         commands.append(f"docker manifest push {config.name}:{digests[config.name]}")
 
         if add_latest:
-            commands.append(
-                "docker manifest create --amend "
-                + " ".join((f"{config.name}:{t}" for t in tags))
-            )
-            commands.append(f"docker manifest push {config.name}:latest")
+            commands.append(f"docker tag {config.name}:{tags[0]} {config.name}:latest")
+            commands.append(f"docker push {config.name}:latest")
 
         return Result.from_commands_run(
             name=f"merge: {config.name}:{digests[config.name]} (latest={add_latest})",

ci/praktika/result.py

@@ -193,10 +193,9 @@ def set_link(self, link) -> "Result":
         self.dump()
         return self
 
-    def add_job_summary_to_info(
-        self, with_local_run_command=False, with_test_in_run_command=False
-    ):
+    def _add_job_summary_to_info(self):
         subresult_with_tests = self
+        with_test_in_run_command = False
 
         # Use a specific sub-result if configured
         job_config = _Environment.get().JOB_CONFIG or {}
@@ -205,6 +204,7 @@ def add_job_summary_to_info(
             for r in self.results:
                 if r.name == result_name_for_cidb:
                     subresult_with_tests = r
+                    with_test_in_run_command = True
                     if subresult_with_tests.info:
                         self.set_info(subresult_with_tests.info)
                     break
@@ -218,8 +218,8 @@ def add_job_summary_to_info(
 
         if failed:
             if len(failed) < 10:
-                failed_tcs = "\n".join(failed)
-                self.set_info(f"Failed:\n{failed_tcs}")
+                failed_tcs = ", ".join(failed)
+                self.set_info(f"Failed: {failed_tcs}")
 
         # Suggest local command to rerun
         if with_local_run_command:
@@ -454,7 +454,9 @@ def from_commands_run(
             files=[log_file] if with_log else None,
         )
 
-    def complete_job(self):
+    def complete_job(self, with_job_summary_in_info=True):
+        if with_job_summary_in_info:
+            self._add_job_summary_to_info()
         self.dump()
         if not self.is_ok():
             print("ERROR: Job Failed")