diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2017-07-18 15:00:18 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2017-07-18 16:34:33 +0200 |
| commit | 012622d3c9466f5dc2bd0ca47c53498fbb167e3e (patch) | |
| tree | 3e6ce8aa75c936d15593ed017bd086114a5b2ae2 | |
| parent | 50cd6f06ef7d8dade7f9c78810c4c3e42a00e312 (diff) | |
syz-ci: fix dashboard settings in manager config
| -rw-r--r-- | syz-ci/manager.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/syz-ci/manager.go b/syz-ci/manager.go index 6d0ea871d..0d6a49ca8 100644 --- a/syz-ci/manager.go +++ b/syz-ci/manager.go @@ -310,18 +310,19 @@ func (mgr *Manager) writeConfig(info *BuildInfo) (string, error) { return "", err } current := mgr.currentDir - tag := info.Tag - if mgr.dash == nil { + if mgr.dash != nil { + mgrcfg.Tag = info.Tag + + mgrcfg.Dashboard_Client = mgr.dash.Client + mgrcfg.Dashboard_Addr = mgr.dash.Addr + mgrcfg.Dashboard_Key = mgr.dash.Key + } else { // Dashboard identifies builds by unique tags that are combined // from kernel tag, compiler tag and config tag. // This combined tag is meaningless without dashboard, // so we use kenrel tag (commit tag) because it communicates // at least some useful information. - tag = info.KernelCommit - - mgrcfg.Dashboard_Client = mgr.dash.Client - mgrcfg.Dashboard_Addr = mgr.dash.Addr - mgrcfg.Dashboard_Key = mgr.dash.Key + mgrcfg.Tag = info.KernelCommit } mgrcfg.Name = mgr.cfg.Name + "-" + mgr.name if mgr.cfg.Hub_Addr != "" { @@ -335,7 +336,6 @@ func (mgr *Manager) writeConfig(info *BuildInfo) (string, error) { // update the source, or even delete and re-clone. If this causes // problems, we need to make a copy of sources after build. mgrcfg.Kernel_Src = mgr.kernelDir - mgrcfg.Tag = tag mgrcfg.Syzkaller = filepath.FromSlash("syzkaller/current") mgrcfg.Image = filepath.Join(current, "image") mgrcfg.Sshkey = filepath.Join(current, "key") |