squidient 3.0.3__tar.gz → 3.0.4__tar.gz

{squidient-3.0.3 → squidient-3.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squidient
-Version: 3.0.3
+Version: 3.0.4
 Summary: CI/CD framework for alya
 Project-URL: Homepage, https://alya.gitlab.bsc.es/alya/ci-cd/squidient
 Project-URL: Bug Tracker, https://alya.gitlab.bsc.es/alya/ci-cd/squidient/issues

{squidient-3.0.3 → squidient-3.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "squidient"
-version = "3.0.3"
+version = "3.0.4"
 authors = [
   { name="Damien Dosimont", email="damien.dosimont@gmail.com" },
 ]

{squidient-3.0.3 → squidient-3.0.4}/src/squidient/definitions.py

@@ -66,6 +66,7 @@ max_advised_builds = 2
 database_name = {"test": "rooster_test", "production": "rooster"}
 benchmark_failure_sender = "damien.dosimont@bsc.es"
 benchmark_failure_copy = ["damien.dosimont@bsc.es"]
+benchmark_notification_failure_log = "log/benchmark_notification_failures.log"
 benchmark_failure_log_files = [
     "sbatch.out",
     "sbatch.err",

{squidient-3.0.3 → squidient-3.0.4}/src/squidient/monitoring/monitoring.py

@@ -19,10 +19,11 @@
 
 
 import logging
+import os
 
 from ..builds.benchmark_build_execution import BenchmarkBuildExecution
 from ..builds.benchmark_build_orchestrator import BenchmarkBuildOrchestrator
-from ..definitions import benchmark_build_report_dir
+from ..definitions import benchmark_build_report_dir, benchmark_notification_failure_log
 from ..reports.monitoring import MonitoringReport
 from ..staging.staging import Staging, WorkflowFailure
 from ..testing.benchmarks.test_orchestrator import BenchmarkTestOrchestrator
@@ -122,6 +123,7 @@ class Monitoring(Staging):
             return
         failures = self._test_orchestrator.get_notification_failures()
         if len(failures) > 0:
+            self.write_notification_failure_log(failures)
             self._report.write_notification_failures(failures)
 
     def validate(self):
@@ -130,12 +132,27 @@ class Monitoring(Staging):
             failures = self._report.get_notification_failures()
         if len(failures) > 0:
             console.section("Notification failures")
+            self.write_notification_failure_log(failures)
         for failure in failures:
-            console.error(failure.get("message", str(failure)), level=1)
+            message = failure.get("message", str(failure))
+            log_path = failure.get("log", benchmark_notification_failure_log)
+            console.error(message + "\nDetails written to " + log_path, level=1)
         if len(failures) > 0:
             raise WorkflowFailure("Benchmark notification email could not be sent")
         super().validate()
 
+    def write_notification_failure_log(self, failures):
+        log_dir = os.path.dirname(benchmark_notification_failure_log)
+        if log_dir != "":
+            os.makedirs(log_dir, exist_ok=True)
+        with open(benchmark_notification_failure_log, "w", encoding="utf-8") as log:
+            for index, failure in enumerate(failures, start=1):
+                failure["log"] = benchmark_notification_failure_log
+                log.write("Notification failure " + str(index) + "\n")
+                log.write("=" * 80 + "\n")
+                log.write(failure.get("details", failure.get("message", str(failure))))
+                log.write("\n\n")
+
     def build(self, terraform):
         with self.timer("monitoring.build"):
             self._monitoring_db = MonitoringDB(self._config, enable=False)

{squidient-3.0.3 → squidient-3.0.4}/src/squidient/testing/benchmarks/failure_notifier.py

@@ -39,12 +39,12 @@ class BenchmarkFailureNotificationError(Exception):
             "Benchmark failure email could not be sent.\n"
             "Recipients: " + ", ".join(self.recipients) + "\n"
             "Subject: " + self.subject + "\n"
-            "Transport error: " + self.error + "\n"
-            "\n"
-            "Mail body:\n"
-            + self.body
+            "Transport error: " + self.error
         )
 
+    def details(self):
+        return self.message() + "\n\nMail body:\n" + self.body
+
     def as_dict(self):
         return {
             "recipients": self.recipients,
@@ -52,6 +52,7 @@ class BenchmarkFailureNotificationError(Exception):
             "body": self.body,
             "error": self.error,
             "message": self.message(),
+            "details": self.details(),
         }
 
 
@@ -140,7 +141,11 @@ class BenchmarkFailureNotifier:
         message.set_content(body)
         sendmail = shutil.which("sendmail")
         if sendmail is not None:
-            subprocess.run([sendmail, "-t"], input=message.as_string(), text=True, check=True)
+            command = [sendmail]
+            if self._from_address is not None:
+                command.extend(["-f", self._from_address])
+            command.append("-t")
+            subprocess.run(command, input=message.as_string(), text=True, check=True)
             return
         with smtplib.SMTP("localhost") as smtp:
             smtp.send_message(message)