Bug 1323110 - Return taskcluster information in job detail endpoint

mozilla · Feb 21, 2017 · 6832102 · 6832102
1 parent f0eaf7f
commit 6832102
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/tests/webapp/api/test_jobs_api.py b/tests/webapp/api/test_jobs_api.py
@@ -9,6 +9,7 @@
 from treeherder.model.models import (ExclusionProfile,
                                      Job,
                                      JobExclusion,
+                                     TaskclusterMetadata,
                                      TextLogError,
                                      TextLogStep)
 from treeherder.webapp.api.jobs import JobsViewSet
@@ -241,6 +242,21 @@ def test_job_detail(webapp, test_job):
     assert resp.status_int == 200
     assert isinstance(resp.json, dict)
     assert resp.json["id"] == test_job.id
+    assert not resp.json.get("taskcluster_metadata")
+
+    # add some taskcluster metadata to the test job so we can test that too
+    tm = TaskclusterMetadata.objects.create(job=test_job,
+                                            task_id='IYyscnNMTLuxzna7PNqUJQ',
+                                            retry_id=0)
+    resp = webapp.get(
+        reverse("jobs-detail",
+                kwargs={"project": test_job.repository.name,
+                        "pk": test_job.id})
+    )
+    assert resp.json["taskcluster_metadata"] == {
+        "task_id": tm.task_id,
+        "retry_id": tm.retry_id
+    }
 
 
 def test_job_retrigger_unauthorized(webapp, test_repository):

diff --git a/treeherder/webapp/api/jobs.py b/treeherder/webapp/api/jobs.py
@@ -235,7 +235,7 @@ def retrieve(self, request, project, pk=None):
         """
         try:
             job = Job.objects.select_related(
-                *self._default_select_related).get(
+                *self._default_select_related + ['taskcluster_metadata']).get(
                     repository__name=project, id=pk)
         except Job.DoesNotExist:
             return Response("No job with id: {0}".format(pk), status=HTTP_404_NOT_FOUND)
@@ -253,6 +253,14 @@ def retrieve(self, request, project, pk=None):
         if platform_option:
             resp["platform_option"] = platform_option
 
+        try:
+            resp['taskcluster_metadata'] = {
+                'task_id': job.taskcluster_metadata.task_id,
+                'retry_id': job.taskcluster_metadata.retry_id
+            }
+        except ObjectDoesNotExist:
+            pass
+
         return Response(resp)
 
     def list(self, request, project):