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

Unified Diff: ct/go/worker_scripts/capture_archives/main.go

Issue 1392173005: [CT] Update worker scripts to use new benchmarks and delete old benchmarks (Closed) Base URL: https://skia.googlesource.com/buildbot@master
Patch Set: Remove staging code Created 5 years, 2 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
Index: ct/go/worker_scripts/capture_archives/main.go
diff --git a/ct/go/worker_scripts/capture_archives/main.go b/ct/go/worker_scripts/capture_archives/main.go
index 59861c25a05a9dafca40e0986213c2ca3b286d41..34fe88daf5687cfd734d72b70154285a995579b6 100644
--- a/ct/go/worker_scripts/capture_archives/main.go
+++ b/ct/go/worker_scripts/capture_archives/main.go
@@ -3,9 +3,11 @@
package main
import (
+ "encoding/json"
"flag"
"fmt"
"io/ioutil"
+ "os"
"path/filepath"
"github.com/skia-dev/glog"
@@ -97,13 +99,27 @@ func main() {
pagesetArchiveName := strings.TrimSuffix(pagesetBaseName, filepath.Ext(pagesetBaseName))
pagesetPath := filepath.Join(pathToPagesets, fileInfo.Name())
+ pagesetContent, err := os.Open(pagesetPath)
dogben 2015/10/14 18:25:50 Nit: maybe create a util function like: func ReadP
rmistry 2015/10/15 12:23:21 Done.
+ if err != nil {
+ glog.Errorf("Could not read %s: %s", pagesetPath, err)
+ return
+ }
+ decodedPageset := util.PagesetVars{}
+ if err := json.NewDecoder(pagesetContent).Decode(&decodedPageset); err != nil {
+ glog.Errorf("Could not JSON decode %s: %s", pagesetPath, err)
+ return
+ }
+
glog.Infof("===== Processing %s =====", pagesetPath)
args := []string{
+ util.CAPTURE_ARCHIVES_DEFAULT_CT_BENCHMARK,
"--extra-browser-args=--disable-setuid-sandbox",
"--browser=exact",
"--browser-executable=" + chromiumBinary,
fmt.Sprintf("%s_page_set", pagesetArchiveName),
- "--page-set-base-dir=" + pathToPagesets,
+ "--user-agent=" + decodedPageset.UserAgent,
+ "--urls-list=" + decodedPageset.UrlsList,
+ "--archive-data-file=" + decodedPageset.ArchiveDataFile,
}
env := []string{
fmt.Sprintf("PYTHONPATH=%s:$PYTHONPATH", pathToPagesets),

Powered by Google App Engine
This is Rietveld 408576698