[infra] Roll infra dependency
Change-Id: Ibe4e929b7d160b3dbf0e5b6ae093b4bab419817d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375198
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
diff --git a/go.mod b/go.mod
index 7d06753..9a1e92d 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,6 @@
github.com/Microsoft/go-winio v0.4.15 // indirect
github.com/VividCortex/godaemon v0.0.0-20150910212227-3d9f6e0b234f // indirect
github.com/andygrunwald/go-gerrit v0.0.0-20200503132804-ed2419acda39
- github.com/bazelbuild/remote-apis v0.0.0-20201113154229-1e9ccef3705c // indirect
github.com/bazelbuild/remote-apis-sdks v0.0.0-20201120151053-8f976b9bf4fc // indirect
github.com/boltdb/bolt v1.3.1 // indirect
github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633
@@ -37,7 +36,7 @@
github.com/vektra/mockery v1.1.2 // indirect
github.com/xanzy/ssh-agent v0.3.0 // indirect
go.chromium.org/luci v0.0.0-20201121231857-b9ab316d7198 // indirect
- go.skia.org/infra v0.0.0-20201221193112-e9c390189fa6
+ go.skia.org/infra v0.0.0-20210225173621-2d381258bc7f
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85 // indirect
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 // indirect
diff --git a/go.sum b/go.sum
index b80955e..54f07c6 100644
--- a/go.sum
+++ b/go.sum
@@ -275,6 +275,8 @@
github.com/bazelbuild/remote-apis v0.0.0-20201030192148-aa8e718768c2/go.mod h1:9Y+1FnaNUGVV6wKE0Jdh+mguqDUsyd9uUqokalrC7DQ=
github.com/bazelbuild/remote-apis v0.0.0-20201113154229-1e9ccef3705c h1:rk6YYsIbLDZ/frDYZPANInvCUqAEjPitjRSyWTcsjiA=
github.com/bazelbuild/remote-apis v0.0.0-20201113154229-1e9ccef3705c/go.mod h1:9Y+1FnaNUGVV6wKE0Jdh+mguqDUsyd9uUqokalrC7DQ=
+github.com/bazelbuild/remote-apis v0.0.0-20201209220655-9e72daff42c9 h1:/EMHYfINZDLrrr4f72+MxCYvmJ9EYcL8PYbQFHrnm38=
+github.com/bazelbuild/remote-apis v0.0.0-20201209220655-9e72daff42c9/go.mod h1:9Y+1FnaNUGVV6wKE0Jdh+mguqDUsyd9uUqokalrC7DQ=
github.com/bazelbuild/remote-apis-sdks v0.0.0-20201015165011-bac45969347c h1:+4DMvfGdgCeGwwWhCwTRlMlwlkrLUlWrsv8m75bXiUI=
github.com/bazelbuild/remote-apis-sdks v0.0.0-20201015165011-bac45969347c/go.mod h1:qYwgoeLmixW0VkG6F665WCYE4oneGGqvDzUNmzukY1c=
github.com/bazelbuild/remote-apis-sdks v0.0.0-20201029144734-84eedba4d9ea h1:m6pq4nascFemVhCz2outsp6fDwDqGn5xY/5ZrIzP1Xg=
@@ -287,6 +289,7 @@
github.com/bazelbuild/remote-apis-sdks v0.0.0-20201120151053-8f976b9bf4fc h1:T8tt5LPzm/nE/+DdopIs+6qOOAUNme01K7+d5y5lkxc=
github.com/bazelbuild/remote-apis-sdks v0.0.0-20201120151053-8f976b9bf4fc/go.mod h1:SvHtabqK9r562BLgmQfd+s5hzd9UUS903b0OmQHvzrI=
github.com/bazelbuild/rules_go v0.0.0-20190719190356-6dae44dc5cab/go.mod h1:MC23Dc/wkXEyk3Wpq6lCqz0ZAYOZDw2DR5y3N1q2i7M=
+github.com/bazelbuild/rules_go v0.25.0/go.mod h1:MC23Dc/wkXEyk3Wpq6lCqz0ZAYOZDw2DR5y3N1q2i7M=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -375,7 +378,9 @@
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/dgraph-io/ristretto v0.0.3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/dhui/dktest v0.3.2/go.mod h1:l1/ib23a/CmxAe7yixtrYPc8Iy90Zy2udyaHINM5p58=
github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI=
@@ -1080,6 +1085,7 @@
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.5.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI=
github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
@@ -1548,6 +1554,8 @@
go.skia.org/infra v0.0.0-20201217154708-25854a97e536/go.mod h1:5q1SY6pVIsvuPD68rYiVzgjguBKFy1DlJN5UzFem3uk=
go.skia.org/infra v0.0.0-20201221193112-e9c390189fa6 h1:Si4o3D+S8uveMzJlwP6Xpuo8hwwDMIJl/6w0Ub+6d8I=
go.skia.org/infra v0.0.0-20201221193112-e9c390189fa6/go.mod h1:5q1SY6pVIsvuPD68rYiVzgjguBKFy1DlJN5UzFem3uk=
+go.skia.org/infra v0.0.0-20210225173621-2d381258bc7f h1:7bIdYLWbyYaIIaeUhfxP/Jz5l4KIGYgOOroV6rrfF4I=
+go.skia.org/infra v0.0.0-20210225173621-2d381258bc7f/go.mod h1:WnqjWzF6oICFv15yl3JMIlcPyaE/Ln2SBQJY3LOx620=
go.starlark.net v0.0.0-20201118183435-e55f603d8c79/go.mod h1:5YFcFnRptTN+41758c2bMPiqpGg4zBfYji1IQz8wNFk=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
diff --git a/infra/bots/task_drivers/canary/canary.go b/infra/bots/task_drivers/canary/canary.go
index 732648d..2b15107 100644
--- a/infra/bots/task_drivers/canary/canary.go
+++ b/infra/bots/task_drivers/canary/canary.go
@@ -127,7 +127,7 @@
startTime := time.Now()
// For writing to the step's log stream.
- stdout := td.NewLogStream(ctx, "stdout", td.Info)
+ stdout := td.NewLogStream(ctx, "stdout", td.SeverityInfo)
for {
roll, err := manualRollDB.Get(ctx, rollId)
if err != nil {
diff --git a/infra/bots/task_drivers/cifuzz/cifuzz_test.go b/infra/bots/task_drivers/cifuzz/cifuzz_test.go
index a2a1a5f..b8f91f0 100644
--- a/infra/bots/task_drivers/cifuzz/cifuzz_test.go
+++ b/infra/bots/task_drivers/cifuzz/cifuzz_test.go
@@ -34,7 +34,7 @@
require.Empty(t, res.Exceptions)
require.Len(t, res.Steps, 1)
step := res.Steps[0]
- assert.Equal(t, td.STEP_RESULT_SUCCESS, step.Result)
+ assert.Equal(t, td.StepResultSuccess, step.Result)
assert.Empty(t, step.Errors)
assert.Empty(t, step.Exceptions)
// Make sure the output directory is created
@@ -65,7 +65,7 @@
require.Empty(t, res.Exceptions)
require.Len(t, res.Steps, 1)
step := res.Steps[0]
- assert.Equal(t, td.STEP_RESULT_SUCCESS, step.Result)
+ assert.Equal(t, td.StepResultSuccess, step.Result)
assert.Empty(t, step.Errors)
assert.Empty(t, step.Exceptions)
diff --git a/infra/bots/task_drivers/g3_canary/g3_canary.go b/infra/bots/task_drivers/g3_canary/g3_canary.go
index 51a00df..3c6d948 100644
--- a/infra/bots/task_drivers/g3_canary/g3_canary.go
+++ b/infra/bots/task_drivers/g3_canary/g3_canary.go
@@ -159,7 +159,7 @@
defer td.EndStep(ctx)
// For writing to the step's log stream.
- stdout := td.NewLogStream(ctx, "stdout", td.Info)
+ stdout := td.NewLogStream(ctx, "stdout", td.SeverityInfo)
// Lets add the roll link only once to step data.
addedRollLinkStepData := false
for {
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index e6b92d7..149bde8 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -41563,7 +41563,7 @@
{
"name": "skia/tools/goldctl/${platform}",
"path": "cipd_bin_packages",
- "version": "git_revision:14be8b751c0fb567535f520f8a7bc60c3f40b378"
+ "version": "git_revision:f19e9f103574744189b380c3bd949602233da07b"
}
],
"command": [
diff --git a/infra/lottiecap/gold/lottie-web-aggregator.go b/infra/lottiecap/gold/lottie-web-aggregator.go
index c256bea..00e2080 100644
--- a/infra/lottiecap/gold/lottie-web-aggregator.go
+++ b/infra/lottiecap/gold/lottie-web-aggregator.go
@@ -165,11 +165,11 @@
results := jsonio.GoldResults{
Builder: *builder,
- ChangeListID: *issue,
+ ChangelistID: *issue,
GitHash: *gitHash,
CodeReviewSystem: "gerrit",
Key: defaultKeys,
- PatchSetOrder: *patchset,
+ PatchsetOrder: *patchset,
Results: results,
TaskID: *taskId,
TryJobID: *buildBucketID,
