From 2d8316b8fbe49325a7934843a631dfd0783c8fa3 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 21 Nov 2018 07:16:49 +0100 Subject: syz-ci: default kernel branch to master --- syz-ci/syz-ci.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/syz-ci/syz-ci.go b/syz-ci/syz-ci.go index 93d5572dc..4489a9896 100644 --- a/syz-ci/syz-ci.go +++ b/syz-ci/syz-ci.go @@ -82,7 +82,7 @@ type Config struct { HubKey string `json:"hub_key"` // Optional. Goroot string `json:"goroot"` // Go 1.8+ toolchain dir. SyzkallerRepo string `json:"syzkaller_repo"` - SyzkallerBranch string `json:"syzkaller_branch"` + SyzkallerBranch string `json:"syzkaller_branch"` // Defaults to "master". // Dir with additional syscall descriptions (.txt and .const files). SyzkallerDescriptions string `json:"syzkaller_descriptions"` // GCS path to upload coverage reports from managers (optional). @@ -99,7 +99,7 @@ type ManagerConfig struct { Repo string `json:"repo"` // Short name of the repo (e.g. "linux-next"), used only for reporting. RepoAlias string `json:"repo_alias"` - Branch string `json:"branch"` + Branch string `json:"branch"` // Defaults to "master". Compiler string `json:"compiler"` Userspace string `json:"userspace"` KernelConfig string `json:"kernel_config"` @@ -220,6 +220,9 @@ func loadConfig(filename string) (*Config, error) { if mgr.Name == "" { return nil, fmt.Errorf("param 'managers[%v].name' is empty", i) } + if mgr.Branch == "" { + mgr.Branch = "master" + } mgrcfg := new(mgrconfig.Config) if err := config.LoadData(mgr.ManagerConfig, mgrcfg); err != nil { return nil, fmt.Errorf("manager %v: %v", mgr.Name, err) -- cgit mrf-deployment