diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2022-10-04 12:36:58 +0000 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2022-10-04 15:19:14 +0200 |
| commit | eab8f94940b33c0a2cbc7d8eb2219862b6864b19 (patch) | |
| tree | eda6870f4ad2b744a1576cb247296670c59689d9 | |
| parent | 77d3f68986094b5a8d09dcf4f3b84008e9d1962f (diff) | |
syz-ci: only set asset storage config for managers
Otherwise it leads to `failed to create manager config: bad manager
config: asset storage also requires dashboard client` errors during
patch and image testing.
| -rw-r--r-- | syz-ci/manager.go | 1 | ||||
| -rw-r--r-- | syz-ci/syz-ci.go | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/syz-ci/manager.go b/syz-ci/manager.go index 57370a8d3..0f449268e 100644 --- a/syz-ci/manager.go +++ b/syz-ci/manager.go @@ -524,6 +524,7 @@ func (mgr *Manager) writeConfig(buildTag string) (string, error) { mgrcfg.DashboardClient = mgr.dash.Client mgrcfg.DashboardAddr = mgr.dash.Addr mgrcfg.DashboardKey = mgr.dash.Key + mgrcfg.AssetStorage = mgr.cfg.AssetStorage } if mgr.cfg.HubAddr != "" { mgrcfg.HubClient = mgr.cfg.Name diff --git a/syz-ci/syz-ci.go b/syz-ci/syz-ci.go index 486d66c87..944c0c745 100644 --- a/syz-ci/syz-ci.go +++ b/syz-ci/syz-ci.go @@ -403,7 +403,6 @@ func loadManagerConfig(cfg *Config, mgr *ManagerConfig) error { if (mgr.Jobs.BisectCause || mgr.Jobs.BisectFix) && cfg.BisectBinDir == "" { return fmt.Errorf("manager %v: enabled bisection but no bisect_bin_dir", mgr.Name) } - managercfg.AssetStorage = cfg.AssetStorage mgr.managercfg = managercfg managercfg.Syzkaller = filepath.FromSlash("syzkaller/current") if managercfg.HTTP == "" { |