syz-ci: remember syzkaller builds logs

This might help get more insight into patch testing failures, especially
for old bugs.

1 files changed, 5 insertions, 5 deletions

diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go
index 40c32d38e..68c300e5c 100644
--- a/syz-ci/jobs.go
+++ b/syz-ci/jobs.go
@@ -499,10 +499,10 @@ func (jp *JobProcessor) testPatch(job *Job, mgrcfg *mgrconfig.Config) error {
 		return err
 	}
 	log.Logf(0, "job: building syzkaller on %v...", req.SyzkallerCommit)
-	if err := env.BuildSyzkaller(jp.syzkallerRepo, req.SyzkallerCommit); err != nil {
-		return err
+	syzBuildLog, syzBuildErr := env.BuildSyzkaller(jp.syzkallerRepo, req.SyzkallerCommit)
+	if syzBuildErr != nil {
+		return syzBuildErr
 	}
-
 	log.Logf(0, "job: fetching kernel...")
 	repo, err := vcs.NewRepo(mgrcfg.TargetOS, mgrcfg.Type, mgrcfg.KernelSrc)
 	if err != nil {
@@ -563,11 +563,11 @@ func (jp *JobProcessor) testPatch(job *Job, mgrcfg *mgrconfig.Config) error {
 	log.Logf(0, "job: testing...")
 	results, err := env.Test(3, req.ReproSyz, req.ReproOpts, req.ReproC)
 	if err != nil {
-		return err
+		return fmt.Errorf("%w\n\nsyzkaller build log:\n%s", err, syzBuildLog)
 	}
 	ret, err := aggregateTestResults(results)
 	if err != nil {
-		return err
+		return fmt.Errorf("%w\n\nsyzkaller build log:\n%s", err, syzBuildLog)
 	}
 	rep := ret.report
 	if rep != nil {