cmd/coordinator: on trybot failure, mention that trybots don't rebase

Updates golang/go#19664 Updates golang/go#9858 Updates golang/go#30807 Change-Id: I378979e2745b4d34286a3a038161eb03148771e7 Reviewed-on: https://go-review.googlesource.com/c/build/+/170457 Reviewed-by: Dmitri Shuralyov <[email protected]>
golang · Apr 2, 2019 · b75d190 · b75d190
1 parent e91d385
commit b75d190
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/cmd/coordinator/coordinator.go b/cmd/coordinator/coordinator.go
@@ -1338,6 +1338,8 @@ func (ts *trySet) noteBuildComplete(bs *buildStatus) {
 	benchResults := append([]string(nil), ts.benchResults...)
 	ts.mu.Unlock()
 
+	const failureFooter = "Consult https://build.golang.org/ to see whether they are new failures. Keep in mind that TryBots currently test *exactly* your git commit, without rebasing. If your commit's git parent is old, the failure might've already been fixed."
+
 	if !succeeded {
 		s1 := sha1.New()
 		io.WriteString(s1, buildLog)
@@ -1365,7 +1367,7 @@ func (ts *trySet) noteBuildComplete(bs *buildStatus) {
 					"Build is still in progress...\n"+
 						"This change failed on %s:\n"+
 						"See %s\n\n"+
-						"Consult https://build.golang.org/ to see whether it's a new failure. Other builds still in progress; subsequent failure notices suppressed until final report.",
+						"Other builds still in progress; subsequent failure notices suppressed until final report. "+failureFooter,
 					bs.NameAndBranch(), failLogURL),
 			}); err != nil {
 				log.Printf("Failed to call Gerrit: %v", err)
@@ -1380,7 +1382,7 @@ func (ts *trySet) noteBuildComplete(bs *buildStatus) {
 			ts.mu.Lock()
 			errMsg := ts.errMsg.String()
 			ts.mu.Unlock()
-			score, msg = -1, fmt.Sprintf("%d of %d TryBots failed:\n%s\nConsult https://build.golang.org/ to see whether they are new failures.",
+			score, msg = -1, fmt.Sprintf("%d of %d TryBots failed:\n%s\n"+failureFooter,
 				numFail, len(ts.builds), errMsg)
 		}
 		if len(benchResults) > 0 {