From 60bf6924b42f54dc9b59f1f1c0bb5b9185e7d1ae Mon Sep 17 00:00:00 2001 From: Ravi Mistry Date: Fri, 17 Jul 2020 10:00:04 -0400 Subject: [PATCH] Output different error for when CL cannot be created in canary task driver Bug: skia:10477 Change-Id: I46a48185977a409225583aea58f5fd31cf306d4c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/303266 Reviewed-by: Eric Boren Commit-Queue: Ravi Mistry --- infra/bots/task_drivers/canary/canary.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/infra/bots/task_drivers/canary/canary.go b/infra/bots/task_drivers/canary/canary.go index 56d344142a..1f08719d62 100644 --- a/infra/bots/task_drivers/canary/canary.go +++ b/infra/bots/task_drivers/canary/canary.go @@ -6,6 +6,7 @@ package main import ( "context" + "errors" "flag" "fmt" "time" @@ -114,6 +115,9 @@ func waitForCanaryRoll(parentCtx context.Context, manualRollDB manual.DB, rollId if roll.Result == manual.RESULT_SUCCESS { return nil } else if roll.Result == manual.RESULT_FAILURE { + if cl == "" { + return td.FailStep(ctx, errors.New("Canary roll could not be created. Ask the trooper to investigate (or directly ping rmistry@).")) + } return td.FailStep(ctx, fmt.Errorf("Canary roll [ %s ] failed", cl)) } else if roll.Result == manual.RESULT_UNKNOWN { return td.FailStep(ctx, fmt.Errorf("Canary roll [ %s ] completed with an unknown result", cl))