diff options
| -rw-r--r-- | dashboard/app/email_test.go | 34 | ||||
| -rw-r--r-- | dashboard/app/mail_bug.txt | 21 | ||||
| -rw-r--r-- | docs/syzbot.md | 10 |
3 files changed, 17 insertions, 48 deletions
diff --git a/dashboard/app/email_test.go b/dashboard/app/email_test.go index 48dce40a5..065201464 100644 --- a/dashboard/app/email_test.go +++ b/dashboard/app/email_test.go @@ -70,18 +70,9 @@ This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. -syzbot will keep track of this bug report. -If you forgot to add the Reported-by tag, once the fix for this bug is merged -into any tree, please reply to this email with: -#syz fix: exact-commit-title -To mark this as a duplicate of another syzbot report, please reply with: -#syz dup: exact-subject-of-another-report -If it's a one-off invalid bug report, please reply with: -#syz invalid -Note: if the crash happens again, it will cause creation of a new bug report. -Note: all commands must start from beginning of the line in the email body. -To upstream this report, please reply with: -#syz upstream`, extBugID0, crashLogLink, kernelConfigLink) +syzbot will keep track of this bug report. See: +https://goo.gl/tpsmEJ#bug-status-tracking for how to communicate with syzbot.`, + extBugID0, crashLogLink, kernelConfigLink) if msg.Body != body { t.Fatalf("got email body:\n%s\n\nwant:\n%s", msg.Body, body) } @@ -227,20 +218,11 @@ This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. -syzbot will keep track of this bug report. -If you forgot to add the Reported-by tag, once the fix for this bug is merged -into any tree, please reply to this email with: -#syz fix: exact-commit-title -If you want to test a patch for this bug, please reply with: -#syz test: git://repo/address.git branch -and provide the patch inline or as an attachment. -To mark this as a duplicate of another syzbot report, please reply with: -#syz dup: exact-subject-of-another-report -If it's a one-off invalid bug report, please reply with: -#syz invalid -Note: if the crash happens again, it will cause creation of a new bug report. -Note: all commands must start from beginning of the line in the email body. -`, extBugID1, reproSyzLink, crashLogLink, kernelConfigLink) +syzbot will keep track of this bug report. See: +https://goo.gl/tpsmEJ#bug-status-tracking for how to communicate with syzbot. +syzbot can test patches for this bug, for details see: +https://goo.gl/tpsmEJ#testing-patches`, +extBugID1, reproSyzLink, crashLogLink, kernelConfigLink) if msg.Body != body { t.Fatalf("got email body:\n%s\n\nwant:\n%s", msg.Body, body) } diff --git a/dashboard/app/mail_bug.txt b/dashboard/app/mail_bug.txt index e8743d274..df03974c1 100644 --- a/dashboard/app/mail_bug.txt +++ b/dashboard/app/mail_bug.txt @@ -27,22 +27,9 @@ This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. -syzbot will keep track of this bug report. -If you forgot to add the Reported-by tag, once the fix for this bug is merged -into any tree, please reply to this email with: -#syz fix: exact-commit-title{{if or .ReproCLink .ReproSyzLink}} -If you want to test a patch for this bug, please reply with: -#syz test: git://repo/address.git branch -and provide the patch inline or as an attachment. -{{else}} -{{end}}To mark this as a duplicate of another syzbot report, please reply with: -#syz dup: exact-subject-of-another-report -If it's a one-off invalid bug report, please reply with: -#syz invalid -Note: if the crash happens again, it will cause creation of a new bug report. -Note: all commands must start from beginning of the line in the email body. -{{if .Moderation -}} -To upstream this report, please reply with: -#syz upstream +syzbot will keep track of this bug report. See: +https://goo.gl/tpsmEJ#bug-status-tracking for how to communicate with syzbot.{{if or .ReproCLink .ReproSyzLink}} +syzbot can test patches for this bug, for details see: +https://goo.gl/tpsmEJ#testing-patches {{- end -}} {{- end -}} diff --git a/docs/syzbot.md b/docs/syzbot.md index aeed83197..ea679e8ce 100644 --- a/docs/syzbot.md +++ b/docs/syzbot.md @@ -28,11 +28,11 @@ emails. The commands are: ``` #syz fix: exact-commit-title ```` -It's enough that the commit is merged into any tree, in particular, -you don't need to wait for the commit to be merged into upstream tree. -`syzbot` only needs to know the title by which it will appear in tested trees. -In case of an error or a title change, you can override the commit simply -by sending another `#syz fix` command. +It's enough that the commit is merged into any tree or you are reasonably sure +about its final title, in particular, you don't need to wait for the commit to +be merged into upstream tree. `syzbot` only needs to know the title by which +it will appear in tested trees. In case of an error or a title change, you can +override the commit simply by sending another `#syz fix` command. - to mark the bug as a duplicate of another `syzbot` bug: ``` #syz dup: exact-subject-of-another-report |