Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1248)

Unified Diff: milo/appengine/swarming/buildinfo.go

Issue 2701033003: milo: Add SwarmBucket templating. (Closed)
Patch Set: Apparently "/swarming" is gitignored! Added... Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « milo/appengine/swarming/build.go ('k') | milo/appengine/swarming/expectations/build-running-logdog.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: milo/appengine/swarming/buildinfo.go
diff --git a/milo/appengine/swarming/buildinfo.go b/milo/appengine/swarming/buildinfo.go
index ac4334297566716e51a3f769277de7c1502f1a4e..c93151697f4a0da807933bf1bbec84e78c7f8ed7 100644
--- a/milo/appengine/swarming/buildinfo.go
+++ b/milo/appengine/swarming/buildinfo.go
@@ -17,6 +17,7 @@ import (
"github.com/luci/luci-go/logdog/common/types"
"github.com/luci/luci-go/luci_config/common/cfgtypes"
milo "github.com/luci/luci-go/milo/api/proto"
+ "github.com/luci/luci-go/swarming/tasktemplate"
"golang.org/x/net/context"
)
@@ -131,7 +132,7 @@ func resolveLogDogAnnotations(c context.Context, sr *swarming.SwarmingRpcsTaskRe
// Try and resolve from explicit tags (preferred).
tags := swarmingTags(sr.Tags)
- addr, err := resolveLogDogStreamAddrFromTags(tags)
+ addr, err := resolveLogDogStreamAddrFromTags(tags, taskID, tryNumber)
if err == nil {
return addr, nil
}
@@ -207,7 +208,7 @@ func getLogDogProjectFromKitchen(cmd []string) (proj cfgtypes.ProjectName, isKit
return
}
-func resolveLogDogStreamAddrFromTags(tags map[string]string) (*types.StreamAddr, error) {
+func resolveLogDogStreamAddrFromTags(tags map[string]string, taskID string, tryNumber int64) (*types.StreamAddr, error) {
// If we don't have a LUCI project, abort.
luciProject, logLocation := tags["luci_project"], tags["log_location"]
switch {
@@ -217,6 +218,18 @@ func resolveLogDogStreamAddrFromTags(tags map[string]string) (*types.StreamAddr,
return nil, errors.New("no 'log_location' tag")
}
+ // Gather our Swarming task template parameters and perform a substitution.
+ runID, err := getRunID(taskID, tryNumber)
+ if err != nil {
+ return nil, errors.Annotate(err).Err()
+ }
+ p := tasktemplate.Params{
+ SwarmingRunID: runID,
+ }
+ if logLocation, err = p.Resolve(logLocation); err != nil {
+ return nil, errors.Annotate(err).Reason("failed to resolve swarming task templating in 'log_location'").Err()
+ }
+
addr, err := types.ParseURL(logLocation)
if err != nil {
return nil, errors.Annotate(err).Reason("could not parse LogDog stream from location").Err()
« no previous file with comments | « milo/appengine/swarming/build.go ('k') | milo/appengine/swarming/expectations/build-running-logdog.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698