Skip to content

Commit

Permalink
Revert "Prevent de-duplication of Housekeeper-PerCommit-BuildTaskDriv…
Browse files Browse the repository at this point in the history
…ers"

This reverts commit 8115853.

Reason for revert: Hopefully not needed after https://skia-review.googlesource.com/c/skia/+/262217

Original change's description:
> Prevent de-duplication of Housekeeper-PerCommit-BuildTaskDrivers
> 
> Without this the task was getting deduped with tasks that ran days ago.
> Eg: https://chromium-swarm.appspot.com/task?d=true&id=496142b461f15f10
> 
> Bug: skia:9514
> Change-Id: I1c93e3f298ef5d6be222578618759b5fb63ca8c1
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261555
> Reviewed-by: Ravi Mistry <rmistry@google.com>
> Commit-Queue: Ravi Mistry <rmistry@google.com>

TBR=borenet@google.com,rmistry@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: skia:9514
Change-Id: I90d2d5b52394b791dc744e12c149b31c64af3027
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/263198
Reviewed-by: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
  • Loading branch information
rmistry authored and Skia Commit-Bot committed Jan 8, 2020
1 parent a4c4c3c commit 04e7781
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
7 changes: 0 additions & 7 deletions infra/bots/gen_tasks_logic/gen_tasks_logic.go
Original file line number Diff line number Diff line change
Expand Up @@ -819,13 +819,6 @@ func (b *builder) buildTaskDrivers() string {
CipdPackages: append(specs.CIPD_PKGS_GIT, b.MustGetCipdPackageFromAsset("go")),
Command: []string{
"/bin/bash", "skia/infra/bots/build_task_drivers.sh", specs.PLACEHOLDER_ISOLATED_OUTDIR,
// The following arguments are not used by the script but are specified
// because they prevent de-duplication.
specs.PLACEHOLDER_REPO,
specs.PLACEHOLDER_REVISION,
specs.PLACEHOLDER_ISSUE,
specs.PLACEHOLDER_PATCHSET,
specs.PLACEHOLDER_CODEREVIEW_SERVER,
},
Dimensions: b.linuxGceDimensions(MACHINE_TYPE_SMALL),
EnvPrefixes: map[string][]string{
Expand Down
7 changes: 1 addition & 6 deletions infra/bots/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -13944,12 +13944,7 @@
"command": [
"/bin/bash",
"skia/infra/bots/build_task_drivers.sh",
"${ISOLATED_OUTDIR}",
"<(REPO)",
"<(REVISION)",
"<(ISSUE)",
"<(PATCHSET)",
"<(CODEREVIEW_SERVER)"
"${ISOLATED_OUTDIR}"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
Expand Down

0 comments on commit 04e7781

Please sign in to comment.