AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[infra] Remove UpdateGoDeps

Browse Source 
Bug: skia:10389
Change-Id: Ie2cbca0663227815ceca8734737515228376c8d0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528036
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2022-04-06 12:28:43 -04:00 committed by SkCQ
parent 9f3c6bce48
commit b019e94c44
5 changed files with 0 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
infra/bots/BUILD.bazel
View File

@ -27,7 +27,6 @@ genrule(
"//infra/bots/task_drivers/run_wasm_gm_tests",
"@org_skia_go_infra//infra/bots/task_drivers/build_push_docker_image",
"@org_skia_go_infra//infra/bots/task_drivers/canary",
"@org_skia_go_infra//infra/bots/task_drivers/update_go_deps",
],
outs = ["built_task_drivers.tar"],
# Make a temporary directory in the output directory, as recommended by

27
infra/bots/gen_tasks_logic/gen_tasks_logic.go
View File

@ -1045,33 +1045,6 @@ func (b *jobBuilder) buildTaskDrivers(goos, goarch string) string {
return name
}
// updateGoDeps generates the task to update Go dependencies.
func (b *jobBuilder) updateGoDeps() {
b.addTask(b.Name, func(b *taskBuilder) {
b.usesGo()
b.asset("protoc")
b.cmd(
"./update_go_deps",
"--project_id", "skia-swarming-bots",
"--task_id", specs.PLACEHOLDER_TASK_ID,
"--task_name", b.Name,
"--workdir", ".",
"--gerrit_project", "skia",
"--gerrit_url", "https://skia-review.googlesource.com",
"--repo", specs.PLACEHOLDER_REPO,
"--revision", specs.PLACEHOLDER_REVISION,
"--patch_issue", specs.PLACEHOLDER_ISSUE,
"--patch_set", specs.PLACEHOLDER_PATCHSET,
"--patch_server", specs.PLACEHOLDER_CODEREVIEW_SERVER,
)
b.dep(b.buildTaskDrivers("linux", "amd64"))
b.linuxGceDimensions(MACHINE_TYPE_MEDIUM)
b.addToPATH("cipd_bin_packages", "cipd_bin_packages/bin")
b.cas(CAS_EMPTY)
b.serviceAccount(b.cfg.ServiceAccountRecreateSKPs)
})
}
// createDockerImage creates the specified docker image. Returns the name of the
// generated task.
func (b *jobBuilder) createDockerImage(wasm bool) string {

6
infra/bots/gen_tasks_logic/job_builder.go
View File

@ -105,12 +105,6 @@ func (b *jobBuilder) genTasksForJob() {
return
}
// Update Go Dependencies.
if b.extraConfig("UpdateGoDeps") {
b.updateGoDeps()
return
}
// Create docker image.
if b.extraConfig("CreateDockerImage") {
b.createDockerImage(b.extraConfig("WASM"))

1
infra/bots/jobs.json
View File

@ -235,7 +235,6 @@
{"name": "FM-Win-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN"},
{"name": "FM-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-All"},
{"name": "Housekeeper-Nightly-RecreateSKPs_DryRun"},
{"name": "Housekeeper-Nightly-UpdateGoDeps"},
{"name": "Housekeeper-OnDemand-Presubmit",
"cq_config": {}
},

100
infra/bots/tasks.json
View File

@ -869,12 +869,6 @@
],
"trigger": "nightly"
},
"Housekeeper-Nightly-UpdateGoDeps": {
"tasks": [
"Housekeeper-Nightly-UpdateGoDeps"
],
"trigger": "nightly"
},
"Housekeeper-OnDemand-Presubmit": {
"priority": 1,
"tasks": [
@ -20149,100 +20143,6 @@
"max_attempts": 2,
"service_account": "skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com"
},
"Housekeeper-Nightly-UpdateGoDeps": {
"caches": [
{
"name": "git",
"path": "cache/git"
},
{
"name": "git_cache",
"path": "cache/git_cache"
},
{
"name": "go_cache",
"path": "cache/go_cache"
},
{
"name": "gopath",
"path": "cache/gopath"
}
],
"casSpec": "empty",
"cipd_packages": [
{
"name": "infra/3pp/tools/git/linux-amd64",
"path": "cipd_bin_packages",
"version": "version:2@2.35.1.chromium.8"
},
{
"name": "infra/tools/git/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:304cba432f44135f67b4aaedc140a14fa0d5e336"
},
{
"name": "infra/tools/luci/git-credential-luci/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:304cba432f44135f67b4aaedc140a14fa0d5e336"
},
{
"name": "skia/bots/go",
"path": "go",
"version": "version:16"
},
{
"name": "skia/bots/protoc",
"path": "protoc",
"version": "version:0"
}
],
"command": [
"./update_go_deps",
"--project_id",
"skia-swarming-bots",
"--task_id",
"<(TASK_ID)",
"--task_name",
"Housekeeper-Nightly-UpdateGoDeps",
"--workdir",
".",
"--gerrit_project",
"skia",
"--gerrit_url",
"https://skia-review.googlesource.com",
"--repo",
"<(REPO)",
"--revision",
"<(REVISION)",
"--patch_issue",
"<(ISSUE)",
"--patch_set",
"<(PATCHSET)",
"--patch_server",
"<(CODEREVIEW_SERVER)"
],
"dependencies": [
"Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"machine_type:n1-standard-16",
"os:Debian-10.3",
"pool:Skia"
],
"env_prefixes": {
"GOROOT": [
"go/go"
],
"PATH": [
"go/go/bin",
"cipd_bin_packages",
"cipd_bin_packages/bin"
]
},
"service_account": "skia-recreate-skps@skia-swarming-bots.iam.gserviceaccount.com"
},
"Housekeeper-OnDemand-Presubmit": {
"caches": [
{