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

Use Debian9 builds for ChromeOS until they are fixed.

Browse Source 
Bug: skia:9438
Change-Id: I7cf22d405ca61240730fd3cb38a05c55ddc7ac3e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/282036
Auto-Submit: Weston Tracey <westont@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Weston Tracey <westont@google.com>
This commit is contained in:
Weston Tracey 2020-04-07 07:55:42 -04:00 committed by Skia Commit-Bot
parent 9ff25897db
commit c979aa8551
3 changed files with 349 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,9 @@ const (
DEFAULT_OS_DEBIAN = "Debian-10.3"
DEFAULT_OS_LINUX_GCE = "Debian-10.3"
COMPILE_TASK_NAME_OS_LINUX = "Debian10"
OLD_OS_LINUX_GCE = "Debian-9.8"
COMPILE_TASK_NAME_OS_LINUX = "Debian10"
COMPILE_TASK_NAME_OS_LINUX_OLD = "Debian9"
DEFAULT_OS_MAC = "Mac-10.14.6"
DEFAULT_OS_WIN = "Windows-Server-17763"
@ -465,7 +467,7 @@ func (b *jobBuilder) deriveCompileTaskName() string {
task_os = COMPILE_TASK_NAME_OS_LINUX
} else if b.os("ChromeOS") {
ec = append([]string{"Chromebook", "GLES"}, ec...)
task_os = COMPILE_TASK_NAME_OS_LINUX
task_os = COMPILE_TASK_NAME_OS_LINUX_OLD
} else if b.os("iOS") {
ec = append([]string{task_os}, ec...)
task_os = "Mac"
@ -534,7 +536,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
d["os"], ok = map[string]string{
"Android": "Android",
"ChromeOS": "ChromeOS",
"Debian9": DEFAULT_OS_DEBIAN,
"Debian9": OLD_OS_LINUX_GCE,
"Debian10": DEFAULT_OS_LINUX_GCE,
"Mac": DEFAULT_OS_MAC,
"Mac10.13": "Mac-10.13.6",

4
infra/bots/jobs.json
View File

@ -16,10 +16,12 @@
"Build-Debian10-Clang-arm-Debug-Android_ASAN_Vulkan",
"Build-Debian10-Clang-arm-Debug-Android_Vulkan",
"Build-Debian10-Clang-arm-Debug-Chromebook_GLES",
"Build-Debian9-Clang-arm-Debug-Chromebook_GLES",
"Build-Debian10-Clang-arm-Release-Android",
"Build-Debian10-Clang-arm-Release-Android_API26",
"Build-Debian10-Clang-arm-Release-Android_Vulkan",
"Build-Debian10-Clang-arm-Release-Chromebook_GLES",
"Build-Debian9-Clang-arm-Release-Chromebook_GLES",
"Build-Debian10-Clang-arm-Release-Flutter_Android",
"Build-Debian10-Clang-arm64-Debug-Android",
"Build-Debian10-Clang-arm64-Debug-Android_ASAN",
@ -42,6 +44,7 @@
"Build-Debian10-Clang-x86_64-Debug-ASAN",
"Build-Debian10-Clang-x86_64-Debug-ASAN_Vulkan",
"Build-Debian10-Clang-x86_64-Debug-Chromebook_GLES",
"Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES",
"Build-Debian10-Clang-x86_64-Debug-OpenCL",
"Build-Debian10-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
"Build-Debian10-Clang-x86_64-Debug-SafeStack",
@ -58,6 +61,7 @@
"Build-Debian10-Clang-x86_64-Release-ASAN",
"Build-Debian10-Clang-x86_64-Release-CMake",
"Build-Debian10-Clang-x86_64-Release-Chromebook_GLES",
"Build-Debian9-Clang-x86_64-Release-Chromebook_GLES",
"Build-Debian10-Clang-x86_64-Release-Fast",
"Build-Debian10-Clang-x86_64-Release-MSAN",
"Build-Debian10-Clang-x86_64-Release-NoDEPS",

358
infra/bots/tasks.json
View File

@ -414,6 +414,26 @@
"Build-Debian10-GCC-x86_64-Release-Shared_Docker"
]
},
"Build-Debian9-Clang-arm-Debug-Chromebook_GLES": {
"tasks": [
"Build-Debian9-Clang-arm-Debug-Chromebook_GLES"
]
},
"Build-Debian9-Clang-arm-Release-Chromebook_GLES": {
"tasks": [
"Build-Debian9-Clang-arm-Release-Chromebook_GLES"
]
},
"Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES": {
"tasks": [
"Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES"
]
},
"Build-Debian9-Clang-x86_64-Release-Chromebook_GLES": {
"tasks": [
"Build-Debian9-Clang-x86_64-Release-Chromebook_GLES"
]
},
"Build-Mac-Clang-arm-Debug-iOS": {
"tasks": [
"Build-Mac-Clang-arm-Debug-iOS"
@ -9485,6 +9505,308 @@
],
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"Build-Debian9-Clang-arm-Debug-Chromebook_GLES": {
"caches": [
{
"name": "vpython",
"path": "cache/vpython"
}
],
"cipd_packages": [
{
"name": "infra/tools/luci-auth/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:0e33e0a2c282bee6ca91e452ff3065ec44852d7b"
},
{
"name": "infra/tools/luci/kitchen/${platform}",
"path": ".",
"version": "git_revision:0e33e0a2c282bee6ca91e452ff3065ec44852d7b"
},
{
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:0e33e0a2c282bee6ca91e452ff3065ec44852d7b"
},
{
"name": "skia/bots/armhf_sysroot",
"path": "armhf_sysroot",
"version": "version:7"
},
{
"name": "skia/bots/chromebook_arm_gles",
"path": "chromebook_arm_gles",
"version": "version:0"
},
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:20"
}
],
"command": [
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
"-u",
"skia/infra/bots/run_recipe.py",
"${ISOLATED_OUTDIR}",
"compile",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Debug-Chromebook_GLES\",\"swarm_out_dir\":\"build\"}",
"skia"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
"gpu:none",
"os:Debian-9.8",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"cipd_bin_packages",
"cipd_bin_packages/bin"
],
"VPYTHON_VIRTUALENV_ROOT": [
"cache/vpython"
]
},
"execution_timeout_ns": 3600000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
"idempotent": true,
"io_timeout_ns": 3600000000000,
"isolate": "compile.isolate",
"max_attempts": 2,
"outputs": [
"build"
],
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"Build-Debian9-Clang-arm-Release-Chromebook_GLES": {
"caches": [
{
"name": "vpython",
"path": "cache/vpython"
}
],
"cipd_packages": [
{
"name": "infra/tools/luci-auth/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:0e33e0a2c282bee6ca91e452ff3065ec44852d7b"
},
{
"name": "infra/tools/luci/kitchen/${platform}",
"path": ".",
"version": "git_revision:0e33e0a2c282bee6ca91e452ff3065ec44852d7b"
},
{
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:0e33e0a2c282bee6ca91e452ff3065ec44852d7b"
},
{
"name": "skia/bots/armhf_sysroot",
"path": "armhf_sysroot",
"version": "version:7"
},
{
"name": "skia/bots/chromebook_arm_gles",
"path": "chromebook_arm_gles",
"version": "version:0"
},
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:20"
}
],
"command": [
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
"-u",
"skia/infra/bots/run_recipe.py",
"${ISOLATED_OUTDIR}",
"compile",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-arm-Release-Chromebook_GLES\",\"swarm_out_dir\":\"build\"}",
"skia"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
"gpu:none",
"os:Debian-9.8",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"cipd_bin_packages",
"cipd_bin_packages/bin"
],
"VPYTHON_VIRTUALENV_ROOT": [
"cache/vpython"
]
},
"execution_timeout_ns": 3600000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
"idempotent": true,
"io_timeout_ns": 3600000000000,
"isolate": "compile.isolate",
"max_attempts": 2,
"outputs": [
"build"
],
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES": {
"caches": [
{
"name": "vpython",
"path": "cache/vpython"
}
],
"cipd_packages": [
{
"name": "infra/tools/luci-auth/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:0e33e0a2c282bee6ca91e452ff3065ec44852d7b"
},
{
"name": "infra/tools/luci/kitchen/${platform}",
"path": ".",
"version": "git_revision:0e33e0a2c282bee6ca91e452ff3065ec44852d7b"
},
{
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:0e33e0a2c282bee6ca91e452ff3065ec44852d7b"
},
{
"name": "skia/bots/chromebook_x86_64_gles",
"path": "chromebook_x86_64_gles",
"version": "version:2"
},
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:20"
}
],
"command": [
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
"-u",
"skia/infra/bots/run_recipe.py",
"${ISOLATED_OUTDIR}",
"compile",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES\",\"swarm_out_dir\":\"build\"}",
"skia"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
"gpu:none",
"os:Debian-9.8",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"cipd_bin_packages",
"cipd_bin_packages/bin"
],
"VPYTHON_VIRTUALENV_ROOT": [
"cache/vpython"
]
},
"execution_timeout_ns": 3600000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
"idempotent": true,
"io_timeout_ns": 3600000000000,
"isolate": "compile.isolate",
"max_attempts": 2,
"outputs": [
"build"
],
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"Build-Debian9-Clang-x86_64-Release-Chromebook_GLES": {
"caches": [
{
"name": "vpython",
"path": "cache/vpython"
}
],
"cipd_packages": [
{
"name": "infra/tools/luci-auth/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:0e33e0a2c282bee6ca91e452ff3065ec44852d7b"
},
{
"name": "infra/tools/luci/kitchen/${platform}",
"path": ".",
"version": "git_revision:0e33e0a2c282bee6ca91e452ff3065ec44852d7b"
},
{
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:0e33e0a2c282bee6ca91e452ff3065ec44852d7b"
},
{
"name": "skia/bots/chromebook_x86_64_gles",
"path": "chromebook_x86_64_gles",
"version": "version:2"
},
{
"name": "skia/bots/clang_linux",
"path": "clang_linux",
"version": "version:20"
}
],
"command": [
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
"-u",
"skia/infra/bots/run_recipe.py",
"${ISOLATED_OUTDIR}",
"compile",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Chromebook_GLES\",\"swarm_out_dir\":\"build\"}",
"skia"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
"gpu:none",
"os:Debian-9.8",
"pool:Skia"
],
"env_prefixes": {
"PATH": [
"cipd_bin_packages",
"cipd_bin_packages/bin"
],
"VPYTHON_VIRTUALENV_ROOT": [
"cache/vpython"
]
},
"execution_timeout_ns": 3600000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
"idempotent": true,
"io_timeout_ns": 3600000000000,
"isolate": "compile.isolate",
"max_attempts": 2,
"outputs": [
"build"
],
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"Build-Mac-Clang-arm-Debug-iOS": {
"caches": [
{
@ -18716,7 +19038,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Release-Chromebook_GLES",
"Build-Debian9-Clang-arm-Release-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -18783,7 +19105,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Release-Chromebook_GLES",
"Build-Debian9-Clang-arm-Release-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -18850,7 +19172,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Release-Chromebook_GLES",
"Build-Debian9-Clang-arm-Release-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -18917,7 +19239,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-x86_64-Release-Chromebook_GLES",
"Build-Debian9-Clang-x86_64-Release-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -18984,7 +19306,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Release-Chromebook_GLES",
"Build-Debian9-Clang-arm-Release-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -19051,7 +19373,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Release-Chromebook_GLES",
"Build-Debian9-Clang-arm-Release-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -31272,7 +31594,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Debug-Chromebook_GLES",
"Build-Debian9-Clang-arm-Debug-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -31339,7 +31661,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Release-Chromebook_GLES",
"Build-Debian9-Clang-arm-Release-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -31406,7 +31728,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Debug-Chromebook_GLES",
"Build-Debian9-Clang-arm-Debug-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -31473,7 +31795,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Release-Chromebook_GLES",
"Build-Debian9-Clang-arm-Release-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -31540,7 +31862,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Debug-Chromebook_GLES",
"Build-Debian9-Clang-arm-Debug-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -31607,7 +31929,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Release-Chromebook_GLES",
"Build-Debian9-Clang-arm-Release-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -31674,7 +31996,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-x86_64-Debug-Chromebook_GLES",
"Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -31741,7 +32063,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-x86_64-Release-Chromebook_GLES",
"Build-Debian9-Clang-x86_64-Release-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -31808,7 +32130,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Debug-Chromebook_GLES",
"Build-Debian9-Clang-arm-Debug-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -31875,7 +32197,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Release-Chromebook_GLES",
"Build-Debian9-Clang-arm-Release-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -31942,7 +32264,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Debug-Chromebook_GLES",
"Build-Debian9-Clang-arm-Debug-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
@ -32009,7 +32331,7 @@
"skia"
],
"dependencies": [
"Build-Debian10-Clang-arm-Release-Chromebook_GLES",
"Build-Debian9-Clang-arm-Release-Chromebook_GLES",
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",