Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cmd/coordinator: render partial build dashboard
This change adds a build dashboard handler to the Coordinator. As part of the effort to remove the app/appengine build dashboard, this moves a large part of the template and logic into cmd/coordinator. As part of this change, cmd/coordinator/internal/dashboard has been created. I originally developed this in the main package, but the main package is very crowded in the coordinator. Giving the dashboard its own package also made testing easier. Currently, this implementation only supports rendering part of the build dashboard for the Go repository on master. It does not yet link to test logs, and only shows successful state. Updates golang/go#34744 Change-Id: I6ffe064b9fc5e4a3271eadfd5ac45d5baf4ebd37 Reviewed-on: https://go-review.googlesource.com/c/build/+/221920 Run-TryBot: Alexander Rakoczy <alex@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Carlos Amedee <carlos@golang.org> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
- Loading branch information
Showing
11 changed files
with
994 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <title>{{$.Dashboard.Name}} Build Dashboard</title> | ||
| <link rel="stylesheet" href="/style.css"/> | ||
| <script async> | ||
| let showUnsupported = window.location.hash.substr(1) !== 'short'; | ||
|
|
||
| function redraw() { | ||
| showUnsupported = !document.querySelector('#showshort').checked; | ||
| document.querySelectorAll('.unsupported').forEach(el => { | ||
| el.hidden = !showUnsupported; | ||
| }); | ||
| window.location.hash = showUnsupported ? '' : 'short'; | ||
| document.querySelectorAll('.Build-builderOS').forEach(el => { | ||
| el.setAttribute( | ||
| 'colspan', | ||
| el.getAttribute( | ||
| showUnsupported ? 'data-archs' : 'data-firstClassArchs' | ||
| ) | ||
| ); | ||
| }); | ||
| document.querySelectorAll('.Build-osColumn').forEach(el => { | ||
| el.setAttribute( | ||
| 'span', | ||
| el.getAttribute( | ||
| showUnsupported ? 'data-archs' : 'data-firstClassArchs' | ||
| ) | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
| window.addEventListener('load', () => { | ||
| document.querySelector('#showshort').checked = !showUnsupported; | ||
| document.querySelector('#showshort').addEventListener('change', redraw); | ||
| redraw(); | ||
| }); | ||
| </script> | ||
| </head> | ||
|
|
||
| <body class="Dashboard"> | ||
| <header class="Dashboard-topbar"> | ||
| <h1>Go Dashboard</h1> | ||
| </header> | ||
|
|
||
| <form action="../.." method="GET"> | ||
| <input type="hidden" name="repo" value="{{.Package.Path}}"/> | ||
| <nav class="Dashboard-controls"> | ||
| {{if not (eq .Branch "")}} | ||
| <label> | ||
| <select name="branch" onchange="this.form.submit()"> | ||
| {{range $.Branches}} | ||
| <option value="{{.}}" {{if eq $.Branch .}} selected{{end}}> | ||
| {{.}} | ||
| </option> | ||
| {{end}} | ||
| </select> | ||
| </label> | ||
| {{end}} | ||
| <label> | ||
| <input type="checkbox" id="showshort"/> | ||
| show only | ||
| <a href="http://golang.org/wiki/PortingPolicy">first-class ports</a> | ||
| </label> | ||
| </nav> | ||
| </form> | ||
| <h2 class="Dashboard-packageName">{{$.Package.Name}}</h2> | ||
|
|
||
| <div class="page Build-scrollTable"> | ||
| {{if $.Commits}} | ||
| <table class="Build"> | ||
| <colgroup class="col-hash" {{if $.Package.Path}} span="2" {{end}}></colgroup> | ||
| <colgroup class="col-user"></colgroup> | ||
| <colgroup class="col-time"></colgroup> | ||
| <colgroup class="Build-descriptionColumn col-desc"></colgroup> | ||
| {{range $.Builders}} | ||
| <colgroup class="Build-osColumn col-result{{if .Unsupported}} unsupported{{end}}" span="{{.Archs | len}}" | ||
| data-archs="{{.Archs | len}}" data-firstClassArchs="{{.FirstClassArchs | len}}"></colgroup> | ||
| {{end}} | ||
| <tr class="Build-builderOSRow"> | ||
| {{if $.Package.Path}} | ||
| <th colspan="2">revision</th> | ||
| {{else}} | ||
| <th> </th> | ||
| {{end}} | ||
| <th></th> | ||
| <th></th> | ||
| <th></th> | ||
| {{range $.Builders}} | ||
| <th class="Build-builderOS{{if not .FirstClass}} unsupported{{end}}" colspan="{{.Archs | len}}" | ||
| data-archs="{{.Archs | len}}" data-firstClassArchs="{{.FirstClassArchs | len}}"> | ||
| {{.OS}} | ||
| </th> | ||
| {{end}} | ||
| </tr> | ||
|
|
||
| <tr class="Build-builderArchRow"> | ||
| {{if $.Package.Path}} | ||
| <th class="result arch">repo</th> | ||
| <th class="result arch">{{$.Dashboard.Name}}</th> | ||
| {{else}} | ||
| <th> </th> | ||
| {{end}} | ||
| <th></th> | ||
| <th></th> | ||
| <th></th> | ||
| {{range $.Builders}} | ||
| {{range.Archs}} | ||
| <th class="result arch{{if not (.FirstClass)}} unsupported{{end}}" title="{{.Name}}"> | ||
| {{.Arch}} | ||
| </th> | ||
| {{end}} | ||
| {{end}} | ||
| </tr> | ||
|
|
||
| <tr class="Build-builderTagRow"> | ||
| <th {{if $.Package.Path}}colspan="2" {{end}}> </th> | ||
| <th></th> | ||
| <th></th> | ||
| <th></th> | ||
| {{range $.Builders}} | ||
| {{range.Archs}} | ||
| <th class="Build-resultArch result arch{{if not (.FirstClass)}} unsupported{{end}}" title="{{.Name}}"> | ||
| {{.Tag}} | ||
| </th> | ||
| {{end}} | ||
| {{end}} | ||
| </tr> | ||
| {{range $c := $.Commits}} | ||
| <tr class="commit"> | ||
| <td class="hash"> | ||
| <span class="ShortHash"> | ||
| <a href="https://go-review.googlesource.com/q/{{$c.Hash}}"> | ||
| {{$c.Hash}} | ||
| </a> | ||
| </span> | ||
| </td> | ||
| <td class="Build-user" title="{{$c.User}}">{{$c.ShortUser}}</td> | ||
| <td class="Build-commitTime"> | ||
| {{$c.Time}} | ||
| </td> | ||
| <td class="Build-desc desc" title="{{$c.Desc}}">{{$c.Desc}}</td> | ||
| {{range $b := $.Builders}} | ||
| {{range $a := .Archs}} | ||
| <td class="{{if not $a.FirstClass}} unsupported{{end}}" data-builder="{{$a.Name}}"> | ||
| {{with $c.ResultForBuilder $a.Name}} | ||
| {{if .OK}} ok {{end}} | ||
| {{end}} | ||
| </td> | ||
| {{end}} | ||
| {{end}} | ||
| </tr> | ||
| {{end}} | ||
| </table> | ||
|
|
||
| {{with $.Pagination}} | ||
| <div class="paginate"> | ||
| <nav> | ||
| {{if .HasPrev}} | ||
| <a href="?repo={{$.Package.Path}}&page={{.Prev}}&branch={{$.Branch}}"> | ||
| newer | ||
| </a> | ||
| {{else}} | ||
| newer | ||
| {{end}} | ||
| {{if .Next}} | ||
| <a href="?repo={{$.Package.Path}}&page={{.Next}}branch={{$.Branch}}"> | ||
| older | ||
| </a> | ||
| {{else}} | ||
| older | ||
| {{end}} | ||
| {{if .HasPrev}} | ||
| <a href="?branch={{$.Branch}}"> | ||
| latest | ||
| </a> | ||
| {{else}} | ||
| latest | ||
| {{end}} | ||
| </nav> | ||
| </div> | ||
| {{end}} | ||
| {{else}} | ||
| <p>No commits to display. Hm.</p> | ||
| {{end}} | ||
| </div> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // Copyright 2020 The Go Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| // +build go1.13 | ||
| // +build linux darwin | ||
|
|
||
| package dashboard | ||
|
|
||
| import ( | ||
| "context" | ||
| "log" | ||
|
|
||
| "cloud.google.com/go/datastore" | ||
| ) | ||
|
|
||
| // getDatastoreResults populates result data on commits, fetched from Datastore. | ||
| func getDatastoreResults(ctx context.Context, cl *datastore.Client, commits []*commit, pkg string) { | ||
| var keys []*datastore.Key | ||
| for _, c := range commits { | ||
| pkey := datastore.NameKey("Package", pkg, nil) | ||
| pkey.Namespace = "Git" | ||
| key := datastore.NameKey("Commit", "|"+c.Hash, pkey) | ||
| key.Namespace = "Git" | ||
| keys = append(keys, key) | ||
| } | ||
| out := make([]*Commit, len(keys)) | ||
| if err := cl.GetMulti(ctx, keys, out); err != nil { | ||
| log.Printf("getResults: error fetching %d results: %v", len(keys), err) | ||
| return | ||
| } | ||
| hashOut := make(map[string]*Commit) | ||
| for _, o := range out { | ||
| if o != nil && o.Hash != "" { | ||
| hashOut[o.Hash] = o | ||
| } | ||
| } | ||
| for _, c := range commits { | ||
| if result, ok := hashOut[c.Hash]; ok { | ||
| c.ResultData = result.ResultData | ||
| } | ||
| } | ||
| return | ||
| } |
Oops, something went wrong.