Fix artefact versions for images

canonical · Jan 14, 2025 · d5dcc08 · d5dcc08
1 parent 445e889
commit d5dcc08
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/backend/test_observer/controllers/artefacts/artefacts.py b/backend/test_observer/controllers/artefacts/artefacts.py
@@ -133,5 +133,7 @@ def get_artefact_versions(
         .where(Artefact.track == artefact.track)
         .where(Artefact.series == artefact.series)
         .where(Artefact.repo == artefact.repo)
+        .where(Artefact.os == artefact.os)
+        .where(Artefact.series == artefact.series)
         .order_by(Artefact.id.desc())
     )
diff --git a/backend/test_observer/controllers/reports/test_executions.py b/backend/test_observer/controllers/reports/test_executions.py
@@ -27,6 +27,8 @@
     Artefact.track,
     Artefact.series,
     Artefact.repo,
+    Artefact.os,
+    Artefact.series,
     TestExecution.id,
     TestExecution.status,
     TestExecution.ci_link,

diff --git a/backend/test_observer/controllers/reports/test_results.py b/backend/test_observer/controllers/reports/test_results.py
@@ -28,6 +28,8 @@
     Artefact.track,
     Artefact.series,
     Artefact.repo,
+    Artefact.os,
+    Artefact.series,
     Artefact.created_at,
     TestExecution.id,
     TestExecution.status,

diff --git a/backend/tests/controllers/reports/test_reports_test_executions.py b/backend/tests/controllers/reports/test_reports_test_executions.py
@@ -143,6 +143,8 @@ def _expected_report_row(
         artefact.track,
         artefact.series,
         artefact.repo,
+        artefact.os,
+        artefact.series,
         str(test_execution.id),
         test_execution.status.name,
         "" if not test_execution.ci_link else test_execution.ci_link,

diff --git a/backend/tests/controllers/reports/test_reports_test_results.py b/backend/tests/controllers/reports/test_reports_test_results.py
@@ -84,6 +84,8 @@ def _expected_report_row(test_result: TestResult) -> list:
         artefact.track,
         artefact.series,
         artefact.repo,
+        artefact.os,
+        artefact.series,
         str(artefact.created_at),
         str(test_execution.id),
         test_execution.status.name,