diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2023-07-20 15:58:35 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2023-07-25 08:23:29 +0000 |
| commit | 67db6ccb7357714a0299fe9f3d192a26bd32ac4e (patch) | |
| tree | 939b66db67290a6d717073310451303ffe353bc2 | |
| parent | f10792b12616db8be4800398ef8eff0c6c1ffa2b (diff) | |
syz-ci: don't always return Build.Commit
For bisections, only return it if it's successful. We don't seem to be
interested in specific values for jobs anyway.
Do the same for KernelCommitDate.
| -rw-r--r-- | dashboard/app/jobs.go | 1 | ||||
| -rw-r--r-- | dashboard/dashapi/dashapi.go | 1 | ||||
| -rw-r--r-- | syz-ci/jobs.go | 13 |
3 files changed, 4 insertions, 11 deletions
diff --git a/dashboard/app/jobs.go b/dashboard/app/jobs.go index 6cbd4bfc8..2567cb30e 100644 --- a/dashboard/app/jobs.go +++ b/dashboard/app/jobs.go @@ -822,7 +822,6 @@ func createJobResp(c context.Context, job *Job, jobKey *db.Key) (*dashapi.JobPol MergeBaseBranch: job.MergeBaseBranch, KernelCommit: build.KernelCommit, KernelCommitTitle: build.KernelCommitTitle, - KernelCommitDate: build.KernelCommitDate, KernelConfig: kernelConfig, SyzkallerCommit: build.SyzkallerCommit, Patch: patch, diff --git a/dashboard/dashapi/dashapi.go b/dashboard/dashapi/dashapi.go index 00d7a9182..af4b89e32 100644 --- a/dashboard/dashapi/dashapi.go +++ b/dashboard/dashapi/dashapi.go @@ -185,7 +185,6 @@ type JobPollResp struct { MergeBaseBranch string KernelCommit string KernelCommitTitle string - KernelCommitDate time.Time KernelConfig []byte SyzkallerCommit string Patch []byte diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go index 36b362ab9..a0f838e7b 100644 --- a/syz-ci/jobs.go +++ b/syz-ci/jobs.go @@ -382,20 +382,15 @@ func (jp *JobProcessor) process(job *Job) *dashapi.JobDoneReq { }, } job.resp = resp + resp.Build.KernelRepo = req.KernelRepo + resp.Build.KernelBranch = req.KernelBranch + resp.Build.KernelCommit = "[unknown]" + resp.Build.KernelConfig = req.KernelConfig switch req.Type { case dashapi.JobTestPatch: mgrcfg.Name += "-test" + jp.instanceSuffix - resp.Build.KernelRepo = req.KernelRepo - resp.Build.KernelBranch = req.KernelBranch - resp.Build.KernelCommit = "[unknown]" case dashapi.JobBisectCause, dashapi.JobBisectFix: mgrcfg.Name += "-bisect" + jp.instanceSuffix - resp.Build.KernelRepo = mgr.mgrcfg.Repo - resp.Build.KernelBranch = mgr.mgrcfg.Branch - resp.Build.KernelCommit = req.KernelCommit - resp.Build.KernelCommitTitle = req.KernelCommitTitle - resp.Build.KernelCommitDate = req.KernelCommitDate - resp.Build.KernelConfig = req.KernelConfig default: err := fmt.Errorf("bad job type %v", req.Type) job.resp.Error = []byte(err.Error()) |