Take ci_link from start of test execution

canonical · Dec 1, 2023 · ecf78ad · ecf78ad
1 parent 4e3bebe
commit ecf78ad
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/backend/scripts/seed_data.py b/backend/scripts/seed_data.py
@@ -18,6 +18,7 @@
         arch="armhf",
         execution_stage="beta",
         environment="rpi2",
+        ci_link="http://localhost",
     ),
     StartTestExecutionRequest(
         family=FamilyName.SNAP,
@@ -29,6 +30,7 @@
         arch="armhf",
         execution_stage="beta",
         environment="rpi2",
+        ci_link="http://localhost",
     ),
     StartTestExecutionRequest(
         family=FamilyName.SNAP,
@@ -40,6 +42,7 @@
         arch="armhf",
         execution_stage="beta",
         environment="rpi2",
+        ci_link="http://localhost",
     ),
     StartTestExecutionRequest(
         family=FamilyName.SNAP,
@@ -51,6 +54,7 @@
         arch="amd64",
         execution_stage="edge",
         environment="dawson-i",
+        ci_link="http://localhost",
     ),
     StartTestExecutionRequest(
         family=FamilyName.SNAP,
@@ -62,6 +66,7 @@
         arch="arm64",
         execution_stage="candidate",
         environment="cm3",
+        ci_link="http://localhost",
     ),
     StartTestExecutionRequest(
         family=FamilyName.SNAP,
@@ -73,6 +78,7 @@
         arch="arm64",
         execution_stage="stable",
         environment="cm3",
+        ci_link="http://localhost",
     ),
     StartTestExecutionRequest(
         family=FamilyName.SNAP,
@@ -84,6 +90,7 @@
         arch="arm64",
         execution_stage="stable",
         environment="dragonboard",
+        ci_link="http://localhost",
     ),
     StartTestExecutionRequest(
         family=FamilyName.DEB,
@@ -94,6 +101,7 @@
         arch="arm64",
         execution_stage="proposed",
         environment="rpi400",
+        ci_link="http://localhost",
     ),
     StartTestExecutionRequest(
         family=FamilyName.DEB,
@@ -104,14 +112,15 @@
         arch="arm64",
         execution_stage="updates",
         environment="rpi400",
+        ci_link="http://localhost",
     ),
 ]
 
 
 def seed_data(client: TestClient | requests.Session):
     for request in REQUESTS:
         client.put(
-            START_TEST_EXECUTION_URL, json=request.model_dump()
+            START_TEST_EXECUTION_URL, data=request.model_dump_json()
         ).raise_for_status()
 
 

diff --git a/backend/test_observer/controllers/test_executions/models.py b/backend/test_observer/controllers/test_executions/models.py
@@ -18,7 +18,7 @@
 #        Omar Selo <[email protected]>
 
 
-from pydantic import BaseModel, field_serializer, model_validator
+from pydantic import BaseModel, HttpUrl, field_serializer, model_validator
 
 from test_observer.data_access.models_enums import FamilyName, TestExecutionStatus
 
@@ -35,6 +35,7 @@ class StartTestExecutionRequest(BaseModel):
     arch: str
     execution_stage: str
     environment: str
+    ci_link: HttpUrl
 
     @field_serializer("family")
     def serialize_dt(self, family: FamilyName):

diff --git a/backend/test_observer/controllers/test_executions/test_executions.py b/backend/test_observer/controllers/test_executions/test_executions.py
@@ -91,6 +91,7 @@ def start_test_execution(
             },
             creation_kwargs={
                 "status": TestExecutionStatus.IN_PROGRESS,
+                "ci_link": request.ci_link,
             },
         )
         return {"id": test_execution.id}

diff --git a/backend/tests/controllers/test_executions/test_test_executions.py b/backend/tests/controllers/test_executions/test_test_executions.py
@@ -46,6 +46,7 @@ def test_creates_all_data_models(db_session: Session, test_client: TestClient):
             "arch": "arm64",
             "execution_stage": "beta",
             "environment": "cm3",
+            "ci_link": "http://localhost",
         },
     )
 
@@ -109,6 +110,7 @@ def test_invalid_artefact_format(test_client: TestClient):
             "arch": "arm64",
             "execution_stage": "beta",
             "environment": "cm3",
+            "ci_link": "http://localhost",
         },
     )
     assert response.status_code == 422
@@ -125,6 +127,7 @@ def test_uses_existing_models(db_session: Session, test_client: TestClient):
         arch="arm64",
         execution_stage="beta",
         environment="cm3",
+        ci_link="http://localhost/",
     )
     stage = (
         db_session.query(Stage).filter(Stage.name == request.execution_stage).first()
@@ -151,7 +154,7 @@ def test_uses_existing_models(db_session: Session, test_client: TestClient):
 
     test_execution_id = test_client.put(
         "/v1/test-executions/start-test",
-        json=request.model_dump(),
+        data=request.model_dump_json(),
     ).json()["id"]
 
     test_execution = (
@@ -163,6 +166,7 @@ def test_uses_existing_models(db_session: Session, test_client: TestClient):
     assert test_execution.artefact_build_id == artefact_build.id
     assert test_execution.environment_id == environment.id
     assert test_execution.status == TestExecutionStatus.IN_PROGRESS
+    assert test_execution.ci_link == "http://localhost/"
 
 
 def test_updates_test_execution(db_session: Session, test_client: TestClient):