Index: ct/go/master_scripts/run_chromium_analysis_on_workers/main.go |
diff --git a/ct/go/master_scripts/run_chromium_analysis_on_workers/main.go b/ct/go/master_scripts/run_chromium_analysis_on_workers/main.go |
index 123be8ede7f274b6496a162d4bbca8d14f71bdd8..b9f3907a55304284891ccc4be5ebf8b6e68a6bbe 100644 |
--- a/ct/go/master_scripts/run_chromium_analysis_on_workers/main.go |
+++ b/ct/go/master_scripts/run_chromium_analysis_on_workers/main.go |
@@ -109,7 +109,7 @@ func main() { |
defer updateWebappTask() |
defer sendEmail(emailsArr) |
// Cleanup dirs after run completes. |
- defer skutil.RemoveAll(filepath.Join(util.StorageDir, util.BenchmarkRunsDir)) |
+ defer skutil.RemoveAll(filepath.Join(util.StorageDir, util.BenchmarkRunsDir, *runID)) |
// Finish with glog flush and how long the task took. |
defer util.TimeTrack(time.Now(), "Running chromium analysis task on workers") |
defer glog.Flush() |
@@ -147,13 +147,19 @@ func main() { |
chromiumPatchLink = util.GS_HTTP_LINK + filepath.Join(util.GSBucketName, remoteOutputDir, chromiumPatchName) |
benchmarkPatchLink = util.GS_HTTP_LINK + filepath.Join(util.GSBucketName, remoteOutputDir, benchmarkPatchName) |
- // Create the required chromium build. |
- chromiumHash, skiaHash, err := util.CreateChromiumBuild(*runID, "Linux", "", "", true, true) |
+ //// Create the required chromium build. |
+ //chromiumHash, skiaHash, err := util.CreateChromiumBuild(*runID, "Linux", "", "", true, true) |
+ //if err != nil { |
+ // glog.Errorf("Could not create chromium build: %s", err) |
+ // return |
+ //} |
+ //chromiumBuild := fmt.Sprintf("try-%s-%s-%s-withpatch", chromiumHash, skiaHash, *runID) |
+ |
+ chromiumBuild, err := util.TriggerBuildRepoSwarmingTask("build_chromium", *runID, "chromium", "Linux", []string{}, []string{filepath.Join(remoteOutputDir, chromiumPatchName)}, true, 3*time.Hour, 1*time.Hour) |
if err != nil { |
- glog.Errorf("Could not create chromium build: %s", err) |
+ glog.Errorf("Error encountered when swarming build repo task: %s", err) |
return |
} |
- chromiumBuild := fmt.Sprintf("try-%s-%s-%s-withpatch", chromiumHash, skiaHash, *runID) |
// Archive, trigger and collect swarming tasks. |
isolateExtraArgs := map[string]string{ |