commit 65b16d90de5c9c8aaa329c5d935882a12923769f
author Joe Gregorio <jcgregorio@google.com> Sat Jul 18 23:04:11 2020 -0400
committer Joe Gregorio <jcgregorio@google.com> Sun Jul 19 03:05:56 2020 +0000
tree df9d48c03e1580eb5119ab6990cbbdf140227bc6
parent 2ecea2abb64840a39050b41de22e854914c3a079

[perf] Fix perf-tool restore funcs.

Change-Id: I7e30c93993de30d57342f918d3e970b7525f246d
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/303800
Reviewed-by: Joe Gregorio <jcgregorio@google.com>

perf/configs/cdb-flutter.json

diff --git a/perf/configs/cdb-flutter.json b/perf/configs/cdb-flutter.json
index 0800208..4a51b61 100644
--- a/perf/configs/cdb-flutter.json
+++ b/perf/configs/cdb-flutter.json
@@ -22,7 +22,7 @@
   },
   "git_repo_config": {
     "url": "https://github.com/flutter/engine",
-    "dir": "/tmp/repo",
+    "dir": "/tmp/flutter-engine",
     "debounce_commit_url": false,
     "commit_url": "%s/commit/%s"
   }

perf/configs/flutter.json

diff --git a/perf/configs/flutter.json b/perf/configs/flutter.json
index 801f649..ed48a2a 100644
--- a/perf/configs/flutter.json
+++ b/perf/configs/flutter.json
@@ -22,7 +22,7 @@
   },
   "git_repo_config": {
     "url": "https://github.com/flutter/engine",
-    "dir": "/tmp/repo",
+    "dir": "/tmp/flutter-engine",
     "debounce_commit_url": false,
     "commit_url": "%s/commit/%s"
   }

perf/go/perf-tool/main.go

diff --git a/perf/go/perf-tool/main.go b/perf/go/perf-tool/main.go
index f585894..2d9aafc 100644
--- a/perf/go/perf-tool/main.go
+++ b/perf/go/perf-tool/main.go
@@ -90,6 +90,7 @@
 			if err != nil {
 				return skerr.Wrap(err)
 			}
+			config.Config = instanceConfig
 
 			return nil
 		},
@@ -394,7 +395,7 @@
 		backupToDate = time.Now().Add(-time.Hour * 24 * 7 * 4)
 	} else {
 		var err error
-		backupToDate, err = time.Parse("2006-01-02", backupToDateFlag)
+		backupToDate, err = time.Parse("2006-01-02", c.Flag(backupToDateFlag).Value.String())
 		if err != nil {
 			return err
 		}
@@ -418,7 +419,7 @@
 	if err != nil {
 		return err
 	}
-	cidl := cid.New(ctx, perfGit, config.Config)
+	cidl := cid.New(ctx, perfGit, instanceConfig)
 	regressionStore, err := builders.NewRegressionStoreFromConfig(ctx, true, cidl, instanceConfig)
 	if err != nil {
 		return err
@@ -477,10 +478,9 @@
 // findFileInZip finds and opens a file within a .zip archive and returns the
 // io.ReadCloser for it.
 func findFileInZip(filename string, z *zip.ReadCloser) (io.ReadCloser, error) {
-	// Find "alerts"
 	var zipFile *zip.File
 	for _, zipReader := range z.File {
-		if zipReader.Name == "alerts" {
+		if zipReader.Name == filename {
 			zipFile = zipReader
 		}
 	}
@@ -605,7 +605,7 @@
 	if err != nil {
 		return err
 	}
-	cidl := cid.New(ctx, perfGit, config.Config)
+	cidl := cid.New(ctx, perfGit, instanceConfig)
 	regressionStore, err := builders.NewRegressionStoreFromConfig(ctx, true, cidl, instanceConfig)
 	if err != nil {
 		return err