From 3ca696b623e655533e74926af5781e999b094da6 Mon Sep 17 00:00:00 2001 From: Maria Skidanova Date: Thu, 9 May 2019 11:31:55 -0700 Subject: [PATCH] Save circleci logs per branch (#1244) * Adding perf testing for daily releases * Circle ci per branch * branch --- toolbox/ci2gubernator/lib/ci2gubernator.go | 4 ++-- toolbox/ci2gubernator/main.go | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/toolbox/ci2gubernator/lib/ci2gubernator.go b/toolbox/ci2gubernator/lib/ci2gubernator.go index 830699cebf8..165b55ed5d2 100644 --- a/toolbox/ci2gubernator/lib/ci2gubernator.go +++ b/toolbox/ci2gubernator/lib/ci2gubernator.go @@ -50,10 +50,10 @@ type Converter struct { } // NewConverter creates a Converter -func NewConverter(bucket, org, repo, job, stage string, build int) *Converter { +func NewConverter(bucket, org, repo, job, stage string, branch string, build int) *Converter { return &Converter{ gcsClient: u.NewGCSClient(bucket), - gcsPathPrefix: filepath.Join(stage, job, strconv.Itoa(build)), + gcsPathPrefix: filepath.Join(stage, branch, job, strconv.Itoa(build)), bucket: bucket, org: org, repo: repo, diff --git a/toolbox/ci2gubernator/main.go b/toolbox/ci2gubernator/main.go index f7345f04bfe..db68c59e1ff 100644 --- a/toolbox/ci2gubernator/main.go +++ b/toolbox/ci2gubernator/main.go @@ -42,6 +42,7 @@ var ( buildLogTXT = flag.String("build_log_txt", "", "Path to the build log") serviceAccountJSON = flag.String("service_account", "", "Path to the service account key") stage = flag.String("stage", "", "Used to multiplex results on GCS") + branch = flag.String("branch", "", "Separate test result per branch.") ) func init() { @@ -70,7 +71,7 @@ func main() { func createPushStartedJSON() { u.AssertIntDefined("pr_number", prNum, unspecifiedInt) - cvt := ci2g.NewConverter(circleciBucket, *org, *repo, *job, *stage, *buildNum) + cvt := ci2g.NewConverter(circleciBucket, *org, *repo, *job, *stage, *branch, *buildNum) if err := cvt.CreateUploadStartedJSON(*prNum, *sha); err != nil { log.Fatalf("Failed to create started.json: %v", err) } @@ -78,7 +79,7 @@ func createPushStartedJSON() { func uploadArtifactsUpdateLatestBuild() { u.AssertNotEmpty("junit_xml", junitXML) - cvt := ci2g.NewConverter(circleciBucket, *org, *repo, *job, *stage, *buildNum) + cvt := ci2g.NewConverter(circleciBucket, *org, *repo, *job, *stage, *branch, *buildNum) if err := cvt.CreateUploadFinishedJSON(*exitCode, *sha); err != nil { log.Fatalf("Failed to create started.json: %v", err) }