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

Add a buildbotless Android bot

Browse Source 
BUG=skia:5626
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2428603002

Review-Url: https://codereview.chromium.org/2428603002
This commit is contained in:
borenet 2016-10-17 10:17:53 -07:00 committed by Commit bot
parent 20cba06a4b
commit 5238343ab2
2 changed files with 136 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
infra/bots/gen_tasks.go
View File

@ -43,6 +43,7 @@ var (
JOBS = []string{
"Build-Ubuntu-GCC-x86_64-Release-GN",
"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
"Housekeeper-PerCommit-InfraTests",
}
@ -83,7 +84,7 @@ func deriveCompileTaskName(jobName string, parts map[string]string) string {
} else if !strings.Contains(ec, "GN_Android") {
ec = task_os
}
task_os = "Android"
task_os = "Ubuntu"
} else if task_os == "iOS" {
ec = task_os
task_os = "Mac"
@ -475,6 +476,15 @@ func process(cfg *specs.TasksCfg, name string) {
// Any remaining bots need a compile task.
compileTaskName := deriveCompileTaskName(name, parts)
compileTaskParts, err := jobNameSchema.ParseJobName(compileTaskName)
if err != nil {
glog.Fatal(err)
}
// Temporarily disable the Housekeeper's compile Task, since we aren't
// yet running that Job.
if parts["role"] != "Housekeeper" {
compile(cfg, compileTaskName, compileTaskParts)
}
// Housekeeper.
if parts["role"] == "Housekeeper" && name != "Housekeeper-PerCommit-InfraTests" {

125
infra/bots/tasks.json
View File

@ -18,6 +18,12 @@
"Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"
]
},
"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
"priority": 0.8,
"tasks": [
"Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android"
]
},
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
"priority": 0.8,
"tasks": [
@ -26,6 +32,49 @@
}
},
"tasks": {
"Build-Ubuntu-Clang-arm-Release-GN_Android": {
"cipd_packages": [
{
"name": "skia/bots/android_sdk",
"path": "android_sdk",
"version": "version:0"
},
{
"name": "skia/bots/android_ndk_linux",
"path": "android_ndk_linux",
"version": "version:5"
},
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:4"
}
],
"dimensions": [
"gpu:none",
"os:Ubuntu",
"pool:Skia"
],
"extra_args": [
"--workdir",
"../../..",
"swarm_compile",
"repository=skia",
"buildername=Build-Ubuntu-Clang-arm-Release-GN_Android",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
"nobuildbot=True",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_storage=<(PATCH_STORAGE)",
"rietveld=<(CODEREVIEW_SERVER)",
"issue=<(ISSUE)",
"patchset=<(PATCHSET)"
],
"isolate": "compile_skia.isolate",
"priority": 0.8
},
"Build-Ubuntu-GCC-x86_64-Release-GN": {
"dimensions": [
"gpu:none",
@ -126,6 +175,52 @@
"isolate": "perf_skia.isolate",
"priority": 0.8
},
"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
"path": "skimage",
"version": "version:8"
},
{
"name": "skia/bots/skp",
"path": "skp",
"version": "version:10"
},
{
"name": "skia/bots/svg",
"path": "svg",
"version": "version:3"
}
],
"dependencies": [
"Build-Ubuntu-Clang-arm-Release-GN_Android"
],
"dimensions": [
"device_type:sprout",
"os:Android",
"pool:Skia"
],
"extra_args": [
"--workdir",
"../../..",
"swarm_test",
"repository=skia",
"buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
"nobuildbot=True",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_storage=<(PATCH_STORAGE)",
"rietveld=<(CODEREVIEW_SERVER)",
"issue=<(ISSUE)",
"patchset=<(PATCHSET)"
],
"isolate": "test_skia.isolate",
"priority": 0.8
},
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
"cipd_packages": [
{
@ -203,6 +298,36 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
"Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
"dependencies": [
"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android"
],
"dimensions": [
"cpu:x86-64-avx2",
"gpu:none",
"os:Ubuntu",
"pool:Skia"
],
"extra_args": [
"--workdir",
"../../..",
"upload_dm_results",
"repository=skia",
"buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
"nobuildbot=True",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_storage=<(PATCH_STORAGE)",
"rietveld=<(CODEREVIEW_SERVER)",
"issue=<(ISSUE)",
"patchset=<(PATCHSET)"
],
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
"Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
"dependencies": [
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"