diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2025-01-13 19:37:36 +0100 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2025-01-14 11:05:01 +0000 |
| commit | 102e004727c29072e43dd2c85db7716bdb8d6878 (patch) | |
| tree | a6a6c68841a7ddbde6998489b2a47677dabbdd4f /syz-ci | |
| parent | 0dce2409ff7389009070e025857c71f752d814e6 (diff) | |
all: support empty HTTP config
We don't really need an HTTP server when running syz-manager during kernel
image testing and when running syz-diff automatically.
Don't require the config to be set and don't start the HTTP server in
this case.
Diffstat (limited to 'syz-ci')
| -rw-r--r-- | syz-ci/manager.go | 3 | ||||
| -rw-r--r-- | syz-ci/syz-ci.go | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/syz-ci/manager.go b/syz-ci/manager.go index 784527023..547b5d9cc 100644 --- a/syz-ci/manager.go +++ b/syz-ci/manager.go @@ -591,8 +591,7 @@ func (mgr *Manager) createTestConfig(imageDir string, info *BuildInfo) (*mgrconf *mgrcfg = *mgr.managercfg mgrcfg.Name += "-test" mgrcfg.Tag = info.KernelCommit - // Use designated ports not to collide with the ports of other managers. - mgrcfg.HTTP = fmt.Sprintf("localhost:%v", mgr.mgrcfg.testHTTPPort) + mgrcfg.HTTP = "" // Don't start the HTTP server. // For GCE VMs, we need to bind to a real networking interface, so no localhost. mgrcfg.RPC = fmt.Sprintf(":%v", mgr.mgrcfg.testRPCPort) mgrcfg.Workdir = filepath.Join(imageDir, "workdir") diff --git a/syz-ci/syz-ci.go b/syz-ci/syz-ci.go index fdaca59f3..ede3bad17 100644 --- a/syz-ci/syz-ci.go +++ b/syz-ci/syz-ci.go @@ -225,8 +225,7 @@ type ManagerConfig struct { managercfg *mgrconfig.Config // Auto-assigned ports used by test instances. - testHTTPPort int - testRPCPort int + testRPCPort int } type ManagerJobs struct { @@ -461,8 +460,6 @@ func loadManagerConfig(cfg *Config, mgr *ManagerConfig) error { managercfg.RPC = fmt.Sprintf(":%v", cfg.RPCPort) cfg.RPCPort++ } - mgr.testHTTPPort = cfg.ManagerPort - cfg.ManagerPort++ mgr.testRPCPort = cfg.RPCPort cfg.RPCPort++ // Note: we don't change Compiler/Ccache because it may be just "gcc" referring |