From 4d9d915eae5984d25a3e7f557106935546a6563f Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Fri, 22 Mar 2019 10:37:50 +0100
Subject: syz-ci: fix filling of kernel commit in bisection jobs

There is a bit of a mess: dashboard expects the start commit
in build info, but syz-ci sends the resulting cause commit.
Moreover for inconclusive bisection the commit is not filled at all.
Fill start commit in build info on start.

Update #501
---
 dashboard/app/jobs.go        | 24 +++++++++++++-----------
 dashboard/dashapi/dashapi.go | 26 ++++++++++++++------------
 2 files changed, 27 insertions(+), 23 deletions(-)

(limited to 'dashboard')

diff --git a/dashboard/app/jobs.go b/dashboard/app/jobs.go
index 7bff92b85..6eae2b65c 100644
--- a/dashboard/app/jobs.go
+++ b/dashboard/app/jobs.go
@@ -394,17 +394,19 @@ func createJobResp(c context.Context, job *Job, jobKey *datastore.Key) (*dashapi
 		return nil, true, nil
 	}
 	resp := &dashapi.JobPollResp{
-		ID:              jobID,
-		Manager:         job.Manager,
-		KernelRepo:      job.KernelRepo,
-		KernelBranch:    job.KernelBranch,
-		KernelCommit:    build.KernelCommit,
-		KernelConfig:    kernelConfig,
-		SyzkallerCommit: build.SyzkallerCommit,
-		Patch:           patch,
-		ReproOpts:       crash.ReproOpts,
-		ReproSyz:        reproSyz,
-		ReproC:          reproC,
+		ID:                jobID,
+		Manager:           job.Manager,
+		KernelRepo:        job.KernelRepo,
+		KernelBranch:      job.KernelBranch,
+		KernelCommit:      build.KernelCommit,
+		KernelCommitTitle: build.KernelCommitTitle,
+		KernelCommitDate:  build.KernelCommitDate,
+		KernelConfig:      kernelConfig,
+		SyzkallerCommit:   build.SyzkallerCommit,
+		Patch:             patch,
+		ReproOpts:         crash.ReproOpts,
+		ReproSyz:          reproSyz,
+		ReproC:            reproC,
 	}
 	switch job.Type {
 	case JobTestPatch:
diff --git a/dashboard/dashapi/dashapi.go b/dashboard/dashapi/dashapi.go
index d53786476..238e1742a 100644
--- a/dashboard/dashapi/dashapi.go
+++ b/dashboard/dashapi/dashapi.go
@@ -126,18 +126,20 @@ type JobPollReq struct {
 }
 
 type JobPollResp struct {
-	ID              string
-	Type            JobType
-	Manager         string
-	KernelRepo      string
-	KernelBranch    string
-	KernelCommit    string
-	KernelConfig    []byte
-	SyzkallerCommit string
-	Patch           []byte
-	ReproOpts       []byte
-	ReproSyz        []byte
-	ReproC          []byte
+	ID                string
+	Type              JobType
+	Manager           string
+	KernelRepo        string
+	KernelBranch      string
+	KernelCommit      string
+	KernelCommitTitle string
+	KernelCommitDate  time.Time
+	KernelConfig      []byte
+	SyzkallerCommit   string
+	Patch             []byte
+	ReproOpts         []byte
+	ReproSyz          []byte
+	ReproC            []byte
 }
 
 type JobDoneReq struct {
-- 
cgit mrf-deployment