Save circleci logs per branch (istio#1244)

* Adding perf testing for daily releases

* Circle ci per branch

* branch

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,

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,15 +71,15 @@ 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)
 	}
 }
 
 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)
 	}