AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update gold aggregators to use new struct

Browse Source 
See https://skia-review.googlesource.com/c/buildbot/+/244259

Change-Id: I761aee95e380f56cf9f49be7c4399b231f7f1f43
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/244887
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
This commit is contained in:
Kevin Lubick 2019-09-27 15:27:28 -04:00
parent 0846d68474
commit 38141d9a78
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
infra/lottiecap/gold/lottie-web-aggregator.go
View File

@ -38,14 +38,14 @@ var (
port = flag.String("port", "8081", "Port to listen on.")
browser = flag.String("browser", "Chrome", "Browser Key")
buildBucketID = flag.Int64("buildbucket_build_id", 0, "Buildbucket build id key")
buildBucketID = flag.String("buildbucket_build_id", "", "Buildbucket build id key")
builder = flag.String("builder", "", "Builder, like 'Test-Debian9-EMCC-GCE-CPU-AVX2-wasm-Debug-All-PathKit'")
renderer = flag.String("renderer", "lottie-web", "e.g. lottie-web or skottie")
config = flag.String("config", "Release", "Configuration (e.g. Debug/Release) key")
gitHash = flag.String("git_hash", "-", "The git commit hash of the version being tested")
hostOS = flag.String("host_os", "Debian9", "OS Key")
issue = flag.Int64("issue", 0, "issue (if tryjob)")
patchset = flag.Int64("patchset", 0, "patchset (if tryjob)")
issue = flag.String("issue", "", "ChangeListID (if tryjob)")
patchset = flag.Int("patchset", 0, "patchset (if tryjob)")
taskId = flag.String("task_id", "", "Skia task id")
)
@ -164,14 +164,16 @@ func dumpJSON(w http.ResponseWriter, r *http.Request) {
}
results := jsonio.GoldResults{
BuildBucketID: *buildBucketID,
Builder: *builder,
GitHash: *gitHash,
GerritChangeListID: *issue,
Key: defaultKeys,
GerritPatchSet: *patchset,
Results: results,
TaskID: *taskId,
Builder: *builder,
ChangeListID: *issue,
GitHash: *gitHash,
CodeReviewSystem: "gerrit",
Key: defaultKeys,
PatchSetOrder: *patchset,
Results: results,
TaskID: *taskId,
TryJobID: *buildBucketID,
ContinuousIntegrationSystem: "buildbucket",
}
enc := json.NewEncoder(outputFile)

23
infra/wasm-common/gold/wasm_gold_aggregator.go
View File

@ -38,14 +38,14 @@ var (
botId = flag.String("bot_id", "", "swarming bot id (deprecated/unused)")
browser = flag.String("browser", "Chrome", "Browser Key")
buildBucketID = flag.Int64("buildbucket_build_id", 0, "Buildbucket build id key")
buildBucketID = flag.String("buildbucket_build_id", "", "Buildbucket build id key")
builder = flag.String("builder", "", "Builder, like 'Test-Debian9-EMCC-GCE-CPU-AVX2-wasm-Debug-All-PathKit'")
compiledLanguage = flag.String("compiled_language", "wasm", "wasm or asm.js")
config = flag.String("config", "Release", "Configuration (e.g. Debug/Release) key")
gitHash = flag.String("git_hash", "-", "The git commit hash of the version being tested")
hostOS = flag.String("host_os", "Debian9", "OS Key")
issue = flag.Int64("issue", 0, "issue (if tryjob)")
patchset = flag.Int64("patchset", 0, "patchset (if tryjob)")
issue = flag.String("issue", "", "ChangeListID (if tryjob)")
patchset = flag.Int("patchset", 0, "patchset (if tryjob)")
taskId = flag.String("task_id", "", "swarming task id")
sourceType = flag.String("source_type", "pathkit", "Gold Source type, like pathkit,canvaskit")
)
@ -176,14 +176,15 @@ func dumpJSON(w http.ResponseWriter, r *http.Request) {
}
dmresults := jsonio.GoldResults{
BuildBucketID: *buildBucketID,
Builder: *builder,
GitHash: *gitHash,
GerritChangeListID: *issue,
Key: defaultKeys,
GerritPatchSet: *patchset,
Results: results,
TaskID: *taskId,
TryJobID: *buildBucketID,
ContinuousIntegrationSystem: "buildbucket",
Builder: *builder,
GitHash: *gitHash,
ChangeListID: *issue,
Key: defaultKeys,
PatchSetOrder: *patchset,
Results: results,
TaskID: *taskId,
}
enc := json.NewEncoder(outputFile)
enc.SetIndent("", " ") // Make it human readable.