app/appengine, cmd/gitmirror: fix things found during deployment failure
Change-Id: I6a0ba0c50fe2b51f6a3251dcf84cca8847142150
Reviewed-on: https://go-review.googlesource.com/c/build/+/210287
Reviewed-by: Carlos Amedee <carlos@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
diff --git a/app/appengine/build.go b/app/appengine/build.go
index 098c77c..989f405 100644
--- a/app/appengine/build.go
+++ b/app/appengine/build.go
@@ -53,7 +53,7 @@
case "NeedsBenchmarking", "TryPatch", "FailNotificationSent":
// Removed in CLs 208397 and 208324.
return true
- case "PackagePath", "ParentHash", "Num", "User", "Desc", "Time", "Branch", "NextNum":
+ case "PackagePath", "ParentHash", "Num", "User", "Desc", "Time", "Branch", "NextNum", "Kind":
// Removed in move to maintner in CL 208697.
return true
}
diff --git a/app/appengine/ui.go b/app/appengine/ui.go
index e6319b2..4e58184 100644
--- a/app/appengine/ui.go
+++ b/app/appengine/ui.go
@@ -200,12 +200,17 @@
// data given a repo name and a dashboard commit from that repo, using
// previously loaded datastore commit info in tb.
func (tb *uiTemplateDataBuilder) newCommitInfo(dsCommits map[string]*Commit, repo string, dc *apipb.DashCommit) *CommitInfo {
+ branch := dc.Branch
+ if branch == "" {
+ branch = "master"
+ }
ci := &CommitInfo{
Hash: dc.Commit,
PackagePath: repo,
User: formatGitAuthor(dc.AuthorName, dc.AuthorEmail),
Desc: cleanTitle(dc.Title, tb.req.Branch),
Time: time.Unix(dc.CommitTimeSec, 0),
+ Branch: branch,
}
if dsc, ok := dsCommits[dc.Commit]; ok {
ci.ResultData = dsc.ResultData
@@ -479,6 +484,7 @@
rev.Date = c.Time.Format(time.RFC3339)
rev.Author = c.User
rev.Desc = c.Desc
+ rev.Branch = c.Branch
}
type Pagination struct {
@@ -672,6 +678,7 @@
User string // "Foo Bar <foo@bar.com>"
Desc string // git commit title
Time time.Time // commit time
+ Branch string // "master", "release-branch.go1.14"
}
// addEmptyResultGoHash adds an empty result containing goHash to
diff --git a/cmd/gitmirror/rc-prod.yaml b/cmd/gitmirror/rc-prod.yaml
index c1a626d..562b2f6 100644
--- a/cmd/gitmirror/rc-prod.yaml
+++ b/cmd/gitmirror/rc-prod.yaml
@@ -26,7 +26,7 @@
env:
- name: XDG_CACHE_HOME
value: "/cache"
- command: ["/tini", "--", "/gitmirror", "-http=:8585", "-mirror=true", "-report=true", "-network=true", "-cachedir=/cache/gitmirror"]
+ command: ["/tini", "--", "/gitmirror", "-http=:8585", "-mirror=true", "-cachedir=/cache/gitmirror"]
volumeMounts:
- mountPath: /cache
name: cache-volume
diff --git a/cmd/gitmirror/rc-staging.yaml b/cmd/gitmirror/rc-staging.yaml
index 18626af..7e79d7d 100644
--- a/cmd/gitmirror/rc-staging.yaml
+++ b/cmd/gitmirror/rc-staging.yaml
@@ -26,7 +26,7 @@
env:
- name: XDG_CACHE_HOME
value: "/cache"
- command: ["/tini", "--", "/gitmirror", "-http=:8585", "-report=true", "-network=true", "-cachedir=/cache/gitmirror"]
+ command: ["/tini", "--", "/gitmirror", "-http=:8585", "-cachedir=/cache/gitmirror"]
volumeMounts:
- mountPath: /cache
name: cache-volume
diff --git a/repos/repos.go b/repos/repos.go
index 4c810d2..8af6373 100644
--- a/repos/repos.go
+++ b/repos/repos.go
@@ -40,7 +40,7 @@
add(&Repo{GoGerritProject: "protobuf", MirroredToGithub: true, ImportPath: "github.com/google/protobuf", HideFromDashboard: true})
add(&Repo{GoGerritProject: "gddo", MirroredToGithub: true, ImportPath: "github.com/golang/gddo", HideFromDashboard: true})
add(&Repo{GoGerritProject: "gofrontend", MirroredToGithub: true, HideFromDashboard: true})
- add(&Repo{GoGerritProject: "gollvm", MirroredToGithub: true, HideFromDashboard: true})
+ add(&Repo{GoGerritProject: "gollvm", MirroredToGithub: false, HideFromDashboard: true})
add(&Repo{GoGerritProject: "grpc-review", MirroredToGithub: false, HideFromDashboard: true})
x("arch")
x("benchmarks")
