Skip to content

Commit

Permalink
[infra] Make Isolate*, BundleRecipes, and BuildTaskDrivers idempotent
Browse files Browse the repository at this point in the history
This should save about a minute on most jobs.

Change-Id: Ida39672333f9e1ee13a1ab85388e7461b1684f8f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223796
Reviewed-by: Ravi Mistry <[email protected]>
Commit-Queue: Eric Boren <[email protected]>
  • Loading branch information
erock2112 authored and Skia Commit-Bot committed Jun 26, 2019
1 parent f209e88 commit 2c1662e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
7 changes: 5 additions & 2 deletions infra/bots/gen_tasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,8 @@ func bundleRecipes(b *specs.TasksCfgBuilder) string {
EnvPrefixes: map[string][]string{
"PATH": []string{"cipd_bin_packages", "cipd_bin_packages/bin"},
},
Isolate: relpath("swarm_recipe.isolate"),
Idempotent: true,
Isolate: relpath("swarm_recipe.isolate"),
})
return BUNDLE_RECIPES_NAME
}
Expand All @@ -731,7 +732,8 @@ func buildTaskDrivers(b *specs.TasksCfgBuilder) string {
EnvPrefixes: map[string][]string{
"PATH": {"cipd_bin_packages", "cipd_bin_packages/bin", "go/go/bin"},
},
Isolate: "task_drivers.isolate",
Idempotent: true,
Isolate: "task_drivers.isolate",
})
return BUILD_TASK_DRIVERS_NAME
}
Expand Down Expand Up @@ -818,6 +820,7 @@ func isolateCIPDAsset(b *specs.TasksCfgBuilder, name string) string {
},
Command: []string{"/bin/cp", "-rL", asset.path, "${ISOLATED_OUTDIR}"},
Dimensions: linuxGceDimensions(MACHINE_TYPE_SMALL),
Idempotent: true,
Isolate: relpath("empty.isolate"),
})
return name
Expand Down
7 changes: 7 additions & 0 deletions infra/bots/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -22873,6 +22873,7 @@
"go/go/bin"
]
},
"idempotent": true,
"isolate": "task_drivers.isolate"
},
"Housekeeper-PerCommit-BundleRecipes": {
Expand Down Expand Up @@ -22916,6 +22917,7 @@
"cipd_bin_packages/bin"
]
},
"idempotent": true,
"isolate": "swarm_recipe.isolate"
},
"Housekeeper-PerCommit-CheckGeneratedFiles": {
Expand Down Expand Up @@ -23333,6 +23335,7 @@
"os:Debian-9.8",
"pool:Skia"
],
"idempotent": true,
"isolate": "empty.isolate"
},
"Housekeeper-PerCommit-IsolateSKP": {
Expand All @@ -23356,6 +23359,7 @@
"os:Debian-9.8",
"pool:Skia"
],
"idempotent": true,
"isolate": "empty.isolate"
},
"Housekeeper-PerCommit-IsolateSVG": {
Expand All @@ -23379,6 +23383,7 @@
"os:Debian-9.8",
"pool:Skia"
],
"idempotent": true,
"isolate": "empty.isolate"
},
"Housekeeper-PerCommit-IsolateSkImage": {
Expand All @@ -23402,6 +23407,7 @@
"os:Debian-9.8",
"pool:Skia"
],
"idempotent": true,
"isolate": "empty.isolate"
},
"Housekeeper-PerCommit-IsolateWinToolchain": {
Expand All @@ -23425,6 +23431,7 @@
"os:Debian-9.8",
"pool:Skia"
],
"idempotent": true,
"isolate": "empty.isolate"
},
"Housekeeper-Weekly-RecreateSKPs": {
Expand Down

0 comments on commit 2c1662e

Please sign in to comment.