Milo: Fix Gerrit/Rietveld link for buildbot builds.

Milo: Fix Gerrit/Rietveld link for buildbot builds.

BUG=728008
Review-Url: https://codereview.chromium.org/2915923002
Committed: https://github.com/luci/luci-go/commit/95d7a370f54f027135a777f3375aa301ea864dc5

[Ryan Tseng, 2017-05-31 22:27:16]

The CQ bit was checked by hinoka@google.com to run a CQ dry run

[commit-bot: I haz the power, 2017-05-31 22:27:22]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-31 22:36:08]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-05-31 22:36:09]

Dry run: Try jobs failed on following builders:
  Luci-go Linux Trusty 32-on-64 Tester on luci.infra.try (JOB_FAILED,
https://luci-milo.appspot.com/swarming/task/3679742866411a10)

[Ryan Tseng, 2017-05-31 22:49:25]

The CQ bit was checked by hinoka@google.com to run a CQ dry run

[commit-bot: I haz the power, 2017-05-31 22:49:31]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-31 22:58:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-05-31 22:58:05]

Dry run: Try jobs failed on following builders:
  Luci-go Linux Trusty 32-on-64 Tester on luci.infra.try (JOB_FAILED,
https://luci-milo.appspot.com/swarming/task/3679887001311710)

[Ryan Tseng, 2017-05-31 23:53:11]

The CQ bit was checked by hinoka@google.com to run a CQ dry run

[commit-bot: I haz the power, 2017-05-31 23:53:18]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-01 00:02:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-06-01 00:02:13]

Dry run: Try jobs failed on following builders:
  Luci-go Linux Trusty 32-on-64 Tester on luci.infra.try (JOB_FAILED,
https://luci-milo.appspot.com/swarming/task/3679c3141b31eb10)

[Ryan Tseng, 2017-06-20 23:54:19]

The CQ bit was checked by hinoka@google.com to run a CQ dry run

[commit-bot: I haz the power, 2017-06-20 23:54:28]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Ryan Tseng, 2017-06-20 23:55:21]

hinoka@google.com changed reviewers:
+ iannucci@chromium.org

[iannucci, 2017-06-21 00:00:45]

gross. lgtm.

https://codereview.chromium.org/2915923002/diff/60001/milo/appengine/buildbot...
File milo/appengine/buildbot/build.go (right):

https://codereview.chromium.org/2915923002/diff/60001/milo/appengine/buildbot...
milo/appengine/buildbot/build.go:403: // TODO(hinoka): Gerrit URLs.
rm?

[Ryan Tseng, 2017-06-21 00:01:28]

https://codereview.chromium.org/2915923002/diff/60001/milo/appengine/buildbot...
File milo/appengine/buildbot/build.go (right):

https://codereview.chromium.org/2915923002/diff/60001/milo/appengine/buildbot...
milo/appengine/buildbot/build.go:403: // TODO(hinoka): Gerrit URLs.
On 2017/06/21 00:00:44, iannucci wrote:
> rm?

herp derp

[Ryan Tseng, 2017-06-21 00:01:36]

The CQ bit was checked by hinoka@google.com to run a CQ dry run

[commit-bot: I haz the power, 2017-06-21 00:01:38]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-21 00:11:07]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-06-21 00:11:08]

Dry run: Try jobs failed on following builders:
  Luci-go Linux Trusty 32-on-64 Tester on luci.infra.try (JOB_FAILED,
https://luci-milo.appspot.com/swarming/task/36e0ca4db3429910)

[Ryan Tseng, 2017-06-21 00:27:59]

The CQ bit was checked by hinoka@google.com to run a CQ dry run

[commit-bot: I haz the power, 2017-06-21 00:28:04]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-21 00:33:35]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-06-21 00:33:36]

Dry run: This issue passed the CQ dry run.

[Ryan Tseng, 2017-06-21 00:51:34]

The CQ bit was checked by hinoka@google.com

[Ryan Tseng, 2017-06-21 00:51:35]

The patchset sent to the CQ was uploaded after l-g-t-m from
iannucci@chromium.org
Link to the patchset: https://codereview.chromium.org/2915923002/#ps100001
(title: "32bit fix")

[commit-bot: I haz the power, 2017-06-21 00:51:45]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-21 00:57:27]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-06-21 00:57:28]

Failed to apply patch for milo/appengine/buildbot/build.go:
While running git apply --index -3 -p1;
  Created missing directory milo/appengine/buildbot.
  error: milo/appengine/buildbot/build.go: does not exist in index

Patch:       milo/appengine/buildbot/build.go
Index: milo/appengine/buildbot/build.go
diff --git a/milo/appengine/buildbot/build.go b/milo/appengine/buildbot/build.go
index
1d88681de1e3d1e6f65cb10094e320d21c25313f..1ba06f1c19915e71d3ce36d3ad1f0bfa26b19773
100644
--- a/milo/appengine/buildbot/build.go
+++ b/milo/appengine/buildbot/build.go
@@ -13,6 +13,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
@@ -395,10 +396,10 @@ func blame(b *buildbotBuild) (result []*resp.Commit) {
 func sourcestamp(c context.Context, b *buildbotBuild) *resp.SourceStamp {
 	ss := &resp.SourceStamp{}
 	rietveld := ""
+	gerrit := ""
 	got_revision := ""
 	repository := ""
 	issue := int64(-1)
-	// TODO(hinoka): Gerrit URLs.
 	for _, prop := range b.Properties {
 		switch prop.Name {
 		case "rietveld":
@@ -408,10 +409,17 @@ func sourcestamp(c context.Context, b *buildbotBuild)
*resp.SourceStamp {
 				logging.Warningf(c, "Field rietveld is not a string: %#v", prop.Value)
 			}
 		case "issue":
+			// Sometime this is a number (float), sometime it is a string.
 			if v, ok := prop.Value.(float64); ok {
 				issue = int64(v)
+			} else if v, ok := prop.Value.(string); ok {
+				if vi, err := strconv.ParseInt(v, 10, 64); err == nil {
+					issue = int64(vi)
+				} else {
+					logging.Warningf(c, "Could not decode field issue: %q - %s", prop.Value,
err)
+				}
 			} else {
-				logging.Warningf(c, "Field issue is not a float: %#v", prop.Value)
+				logging.Warningf(c, "Field issue is not a string or float: %#v",
prop.Value)
 			}
 
 		case "got_revision":
@@ -421,6 +429,20 @@ func sourcestamp(c context.Context, b *buildbotBuild)
*resp.SourceStamp {
 				logging.Warningf(c, "Field got_revision is not a string: %#v", prop.Value)
 			}
 
+		case "patch_issue":
+			if v, ok := prop.Value.(float64); ok {
+				issue = int64(v)
+			} else {
+				logging.Warningf(c, "Field patch_issue is not a float: %#v", prop.Value)
+			}
+
+		case "patch_gerrit_url":
+			if v, ok := prop.Value.(string); ok {
+				gerrit = v
+			} else {
+				logging.Warningf(c, "Field gerrit is not a string: %#v", prop.Value)
+			}
+
 		case "repository":
 			if v, ok := prop.Value.(string); ok {
 				repository = v
@@ -428,16 +450,20 @@ func sourcestamp(c context.Context, b *buildbotBuild)
*resp.SourceStamp {
 		}
 	}
 	if issue != -1 {
-		if rietveld != "" {
+		switch {
+		case rietveld != "":
 			rietveld = strings.TrimRight(rietveld, "/")
 			ss.Changelist = resp.NewLink(
-				fmt.Sprintf("Issue %d", issue),
-				fmt.Sprintf("%s/%d", rietveld, issue),
-			)
-		} else {
-			logging.Warningf(c, "Found issue but not rietveld property.")
+				fmt.Sprintf("Rietveld CL %d", issue),
+				fmt.Sprintf("%s/%d", rietveld, issue))
+		case gerrit != "":
+			gerrit = strings.TrimRight(gerrit, "/")
+			ss.Changelist = resp.NewLink(
+				fmt.Sprintf("Gerrit CL %d", issue),
+				fmt.Sprintf("%s/c/%d", gerrit, issue))
 		}
 	}
+
 	if got_revision != "" {
 		ss.Revision = resp.NewLink(got_revision, "")
 		if repository != "" {

[Ryan Tseng, 2017-06-21 01:00:18]

The CQ bit was checked by hinoka@google.com to run a CQ dry run

[commit-bot: I haz the power, 2017-06-21 01:00:24]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Ryan Tseng, 2017-06-21 01:00:28]

The CQ bit was unchecked by hinoka@google.com

[Ryan Tseng, 2017-06-21 01:00:32]

The CQ bit was checked by hinoka@google.com

[Ryan Tseng, 2017-06-21 01:00:32]

The patchset sent to the CQ was uploaded after l-g-t-m from
iannucci@chromium.org
Link to the patchset: https://codereview.chromium.org/2915923002/#ps120001
(title: "Rebase")

[commit-bot: I haz the power, 2017-06-21 01:00:44]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-21 01:05:39]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-06-21 01:05:41]

Try jobs failed on following builders:
  Luci-go Linux Trusty 32-on-64 Tester on luci.infra.try (JOB_FAILED,
https://luci-milo.appspot.com/swarming/task/36e0fc010f06ce10)
  Luci-go Presubmit on luci.infra.try (JOB_FAILED,
https://luci-milo.appspot.com/swarming/task/36e0fc013440be10)

[Ryan Tseng, 2017-06-21 01:10:56]

The CQ bit was checked by hinoka@google.com to run a CQ dry run

[commit-bot: I haz the power, 2017-06-21 01:10:59]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-21 01:17:09]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-06-21 01:17:10]

Dry run: This issue passed the CQ dry run.

[Ryan Tseng, 2017-06-21 17:04:36]

The CQ bit was checked by hinoka@google.com

[Ryan Tseng, 2017-06-21 17:04:36]

The patchset sent to the CQ was uploaded after l-g-t-m from
iannucci@chromium.org
Link to the patchset: https://codereview.chromium.org/2915923002/#ps140001
(title: "Rebase fix")

[commit-bot: I haz the power, 2017-06-21 17:04:43]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-21 17:09:47]

CQ is committing da patch.

Bot data: {"patchset_id": 140001, "attempt_start_ts": 1498064676018850,
"parent_rev": "4ab136ab49c856a5de394d15946eca3eb22143c0", "commit_rev":
"95d7a370f54f027135a777f3375aa301ea864dc5"}

[commit-bot: I haz the power, 2017-06-21 17:09:53]

Description was changed from

==========
Milo: Fix Gerrit/Rietveld link for buildbot builds.

BUG=728008
==========

to

==========
Milo: Fix Gerrit/Rietveld link for buildbot builds.

BUG=728008

Review-Url: https://codereview.chromium.org/2915923002
Committed:
https://github.com/luci/luci-go/commit/95d7a370f54f027135a777f3375aa301ea864dc5
==========

[commit-bot: I haz the power, 2017-06-21 17:09:54]

Committed patchset #8 (id:140001) as
https://github.com/luci/luci-go/commit/95d7a370f54f027135a777f3375aa301ea864dc5