diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2017-09-19 16:53:47 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2017-09-19 17:00:26 +0200 |
| commit | d394531e95a9d8a4873eafdcfef803e628d110c1 (patch) | |
| tree | c58c0e61e74f916baa8729aff924a05e79ca6483 | |
| parent | 62114d6064c895ae34f1ac232b2fdc94e7329dae (diff) | |
dashboard/app, syz-ci: upload target OS/arch to dashboard
| -rw-r--r-- | dashboard/app/api.go | 3 | ||||
| -rw-r--r-- | dashboard/app/entities.go | 3 | ||||
| -rw-r--r-- | dashboard/app/reporting.go | 3 | ||||
| -rw-r--r-- | dashboard/dashapi/dashapi.go | 6 | ||||
| -rw-r--r-- | syz-ci/manager.go | 11 |
5 files changed, 26 insertions, 0 deletions
diff --git a/dashboard/app/api.go b/dashboard/app/api.go index 9586836a8..08726eed7 100644 --- a/dashboard/app/api.go +++ b/dashboard/app/api.go @@ -200,6 +200,9 @@ func apiUploadBuild(c context.Context, ns string, r *http.Request) (interface{}, Namespace: ns, Manager: req.Manager, ID: req.ID, + OS: req.OS, + Arch: req.Arch, + VMArch: req.VMArch, SyzkallerCommit: req.SyzkallerCommit, CompilerID: req.CompilerID, KernelRepo: req.KernelRepo, diff --git a/dashboard/app/entities.go b/dashboard/app/entities.go index 948002076..60fb2120c 100644 --- a/dashboard/app/entities.go +++ b/dashboard/app/entities.go @@ -28,6 +28,9 @@ type Build struct { Namespace string Manager string ID string // unique ID generated by syz-ci + OS string + Arch string + VMArch string SyzkallerCommit string CompilerID string KernelRepo string diff --git a/dashboard/app/reporting.go b/dashboard/app/reporting.go index 589183f3d..407478b26 100644 --- a/dashboard/app/reporting.go +++ b/dashboard/app/reporting.go @@ -223,6 +223,9 @@ func createBugReport(c context.Context, bug *Bug, crash *Crash, bugReporting *Bu Log: crashLog, Report: report, Maintainers: crash.Maintainers, + OS: build.OS, + Arch: build.Arch, + VMArch: build.VMArch, CompilerID: build.CompilerID, KernelRepo: build.KernelRepo, KernelBranch: build.KernelBranch, diff --git a/dashboard/dashapi/dashapi.go b/dashboard/dashapi/dashapi.go index ddc20ebe4..d59b2a836 100644 --- a/dashboard/dashapi/dashapi.go +++ b/dashboard/dashapi/dashapi.go @@ -36,6 +36,9 @@ func New(client, addr, key string) *Dashboard { type Build struct { Manager string ID string + OS string + Arch string + VMArch string SyzkallerCommit string CompilerID string KernelRepo string @@ -141,6 +144,9 @@ type BugReport struct { Title string Maintainers []string CC []string // additional CC emails + OS string + Arch string + VMArch string CompilerID string KernelRepo string KernelBranch string diff --git a/syz-ci/manager.go b/syz-ci/manager.go index 8cb5e363a..f936a1601 100644 --- a/syz-ci/manager.go +++ b/syz-ci/manager.go @@ -371,6 +371,14 @@ func (mgr *Manager) uploadBuild(info *BuildInfo) error { if err != nil { return fmt.Errorf("failed to read kernel.config: %v", err) } + mgrcfg := new(mgrconfig.Config) + if err := config.LoadData(mgr.mgrcfg.Manager_Config, mgrcfg); err != nil { + return fmt.Errorf("failed to load manager %v config: %v", mgr.name, err) + } + os, vmarch, arch, err := mgrconfig.SplitTarget(mgrcfg.Target) + if err != nil { + return fmt.Errorf("failed to load manager %v config: %v", mgr.name, err) + } commits, err := mgr.pollCommits(info.KernelCommit) if err != nil { // This is not critical for operation. @@ -379,6 +387,9 @@ func (mgr *Manager) uploadBuild(info *BuildInfo) error { build := &dashapi.Build{ Manager: mgr.name, ID: info.Tag, + OS: os, + Arch: arch, + VMArch: vmarch, SyzkallerCommit: syzkallerCommit, CompilerID: info.CompilerID, KernelRepo: info.KernelRepo, |