diff options
Diffstat (limited to 'infra/bots')
8 files changed, 16 insertions, 1205 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 5b9016565f..d111c923af 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -373,12 +373,8 @@ func defaultSwarmDimensions(parts map[string]string) []string { } else if d["os"] == DEFAULT_OS_WIN { // Windows CPU bots. d["cpu"] = "x86-64-Haswell_GCE" - // Use many-core machines for Build tasks on Win GCE, except for Goma. - if strings.Contains(parts["extra_config"], "Goma") { - d["machine_type"] = "n1-standard-16" - } else { - d["machine_type"] = "n1-highcpu-64" - } + // Use many-core machines for Build tasks on Win GCE. + d["machine_type"] = "n1-highcpu-64" } else if d["os"] == DEFAULT_OS_MAC { // Mac CPU bots. d["cpu"] = "x86-64-E5-2697_v2" diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index 03c696153b..ae21c46cd3 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -79,19 +79,12 @@ "Build-Win-Clang-x86-Release", "Build-Win-Clang-x86_64-Debug", "Build-Win-Clang-x86_64-Debug-ANGLE", - "Build-Win-Clang-x86_64-Debug-ANGLE_Goma", - "Build-Win-Clang-x86_64-Debug-Goma", - "Build-Win-Clang-x86_64-Debug-GomaNoFallback", "Build-Win-Clang-x86_64-Debug-UBSAN", "Build-Win-Clang-x86_64-Debug-Vulkan", - "Build-Win-Clang-x86_64-Debug-Vulkan_Goma", "Build-Win-Clang-x86_64-Release", "Build-Win-Clang-x86_64-Release-ANGLE", - "Build-Win-Clang-x86_64-Release-ANGLE_Goma", - "Build-Win-Clang-x86_64-Release-Goma", "Build-Win-Clang-x86_64-Release-UBSAN", "Build-Win-Clang-x86_64-Release-Vulkan", - "Build-Win-Clang-x86_64-Release-Vulkan_Goma", "Build-Win-MSVC-x86-Debug", "Build-Win-MSVC-x86-Release", "Build-Win-MSVC-x86_64-Debug", @@ -240,9 +233,7 @@ "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE", "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All", "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE", - "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma", "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan", - "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma", "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE", "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan", @@ -467,10 +458,8 @@ "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All-ANGLE", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE", - "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump", - "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE", "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GomaNoFallback.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GomaNoFallback.json deleted file mode 100644 index 80b8693996..0000000000 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Debug-GomaNoFallback.json +++ /dev/null @@ -1,196 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/tmp" - ], - "infra_step": true, - "name": "makedirs tmp_dir" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport sys\nimport urllib2\n\nTOKEN_URL = (\n 'http://metadata/computeMetadata/v1/project/attributes/jwt_service_account_goma-client')\n\nreq = urllib2.Request(TOKEN_URL, headers={'Metadata-Flavor': 'Google'})\ncontents = urllib2.urlopen(req).read()\n\nwith open(sys.argv[1], 'w') as f:\n f.write(contents)\n", - "[START_DIR]/tmp/jwt_service_account_goma-client.json" - ], - "infra_step": true, - "name": "download jwt_service_account_goma-client.json", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@import urllib2@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@TOKEN_URL = (@@@", - "@@@STEP_LOG_LINE@python.inline@ 'http://metadata/computeMetadata/v1/project/attributes/jwt_service_account_goma-client')@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@req = urllib2.Request(TOKEN_URL, headers={'Metadata-Flavor': 'Google'})@@@", - "@@@STEP_LOG_LINE@python.inline@contents = urllib2.urlopen(req).read()@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ f.write(contents)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "cipd", - "ensure", - "-root", - "[CACHE]/goma", - "-ensure-file", - "infra_internal/goma/client/linux-amd64 release", - "-json-output", - "/path/to/tmp/json", - "-service-account-json", - "[START_DIR]/tmp/jwt_service_account_goma-client.json" - ], - "name": "ensure_installed", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", - "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ ]@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "goma_ctl.py", - "ensure_start" - ], - "cwd": "[CACHE]/goma", - "env": { - "BUILDTYPE": "Debug_x64", - "CHROME_HEADLESS": "1", - "GOMA_FALLBACK": "0", - "GOMA_HERMETIC": "error", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "GOMA_USE_LOCAL": "0", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GomaNoFallback" - }, - "infra_step": true, - "name": "start goma" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", - "env": { - "BUILDTYPE": "Debug_x64", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GomaNoFallback" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", - "gen", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GomaNoFallback/Debug_x64", - "--args=cc=\"clang\" cc_wrapper=\"[CACHE]/goma/gomacc\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\"] target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", - "env": { - "BUILDTYPE": "Debug_x64", - "CHROME_HEADLESS": "1", - "GOMA_FALLBACK": "0", - "GOMA_HERMETIC": "error", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "GOMA_USE_LOCAL": "0", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GomaNoFallback" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja.exe", - "-k", - "0", - "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GomaNoFallback/Debug_x64", - "-j", - "2000" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", - "env": { - "BUILDTYPE": "Debug_x64", - "CHROME_HEADLESS": "1", - "GOMA_FALLBACK": "0", - "GOMA_HERMETIC": "error", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "GOMA_USE_LOCAL": "0", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GomaNoFallback" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "goma_ctl.py", - "stat" - ], - "cwd": "[CACHE]/goma", - "env": { - "BUILDTYPE": "Debug_x64", - "CHROME_HEADLESS": "1", - "GOMA_FALLBACK": "0", - "GOMA_HERMETIC": "error", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "GOMA_USE_LOCAL": "0", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GomaNoFallback" - }, - "infra_step": true, - "name": "print goma stats" - }, - { - "cmd": [ - "python", - "-u", - "goma_ctl.py", - "ensure_stop" - ], - "cwd": "[CACHE]/goma", - "env": { - "BUILDTYPE": "Debug_x64", - "CHROME_HEADLESS": "1", - "GOMA_FALLBACK": "0", - "GOMA_HERMETIC": "error", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "GOMA_USE_LOCAL": "0", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Debug-GomaNoFallback" - }, - "infra_step": true, - "name": "stop goma" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-ANGLE_Goma.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-ANGLE_Goma.json deleted file mode 100644 index e3705f1ede..0000000000 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-ANGLE_Goma.json +++ /dev/null @@ -1,181 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/tmp" - ], - "infra_step": true, - "name": "makedirs tmp_dir" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport sys\nimport urllib2\n\nTOKEN_URL = (\n 'http://metadata/computeMetadata/v1/project/attributes/jwt_service_account_goma-client')\n\nreq = urllib2.Request(TOKEN_URL, headers={'Metadata-Flavor': 'Google'})\ncontents = urllib2.urlopen(req).read()\n\nwith open(sys.argv[1], 'w') as f:\n f.write(contents)\n", - "[START_DIR]/tmp/jwt_service_account_goma-client.json" - ], - "infra_step": true, - "name": "download jwt_service_account_goma-client.json", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@import urllib2@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@TOKEN_URL = (@@@", - "@@@STEP_LOG_LINE@python.inline@ 'http://metadata/computeMetadata/v1/project/attributes/jwt_service_account_goma-client')@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@req = urllib2.Request(TOKEN_URL, headers={'Metadata-Flavor': 'Google'})@@@", - "@@@STEP_LOG_LINE@python.inline@contents = urllib2.urlopen(req).read()@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ f.write(contents)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "cipd", - "ensure", - "-root", - "[CACHE]/goma", - "-ensure-file", - "infra_internal/goma/client/linux-amd64 release", - "-json-output", - "/path/to/tmp/json", - "-service-account-json", - "[START_DIR]/tmp/jwt_service_account_goma-client.json" - ], - "name": "ensure_installed", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", - "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ ]@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "goma_ctl.py", - "ensure_start" - ], - "cwd": "[CACHE]/goma", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma" - }, - "infra_step": true, - "name": "start goma" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", - "gen", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma/Release_x64", - "--args=cc=\"clang\" cc_wrapper=\"[CACHE]/goma/gomacc\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-Wno-nonportable-include-path\"] is_debug=false skia_use_angle=true target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja.exe", - "-k", - "0", - "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma/Release_x64", - "-j", - "2000" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "goma_ctl.py", - "stat" - ], - "cwd": "[CACHE]/goma", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma" - }, - "infra_step": true, - "name": "print goma stats" - }, - { - "cmd": [ - "python", - "-u", - "goma_ctl.py", - "ensure_stop" - ], - "cwd": "[CACHE]/goma", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-ANGLE_Goma" - }, - "infra_step": true, - "name": "stop goma" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Goma.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Goma.json deleted file mode 100644 index 53daade380..0000000000 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86_64-Release-Goma.json +++ /dev/null @@ -1,181 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/tmp" - ], - "infra_step": true, - "name": "makedirs tmp_dir" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport sys\nimport urllib2\n\nTOKEN_URL = (\n 'http://metadata/computeMetadata/v1/project/attributes/jwt_service_account_goma-client')\n\nreq = urllib2.Request(TOKEN_URL, headers={'Metadata-Flavor': 'Google'})\ncontents = urllib2.urlopen(req).read()\n\nwith open(sys.argv[1], 'w') as f:\n f.write(contents)\n", - "[START_DIR]/tmp/jwt_service_account_goma-client.json" - ], - "infra_step": true, - "name": "download jwt_service_account_goma-client.json", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@import urllib2@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@TOKEN_URL = (@@@", - "@@@STEP_LOG_LINE@python.inline@ 'http://metadata/computeMetadata/v1/project/attributes/jwt_service_account_goma-client')@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@req = urllib2.Request(TOKEN_URL, headers={'Metadata-Flavor': 'Google'})@@@", - "@@@STEP_LOG_LINE@python.inline@contents = urllib2.urlopen(req).read()@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ f.write(contents)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "cipd", - "ensure", - "-root", - "[CACHE]/goma", - "-ensure-file", - "infra_internal/goma/client/linux-amd64 release", - "-json-output", - "/path/to/tmp/json", - "-service-account-json", - "[START_DIR]/tmp/jwt_service_account_goma-client.json" - ], - "name": "ensure_installed", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", - "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ ]@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "goma_ctl.py", - "ensure_start" - ], - "cwd": "[CACHE]/goma", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Goma" - }, - "infra_step": true, - "name": "start goma" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Goma" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe", - "gen", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Goma/Release_x64", - "--args=cc=\"clang\" cc_wrapper=\"[CACHE]/goma/gomacc\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" is_debug=false target_cpu=\"x86_64\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\"" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Goma" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja.exe", - "-k", - "0", - "-C", - "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Goma/Release_x64", - "-j", - "2000" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Goma" - }, - "name": "ninja" - }, - { - "cmd": [ - "python", - "-u", - "goma_ctl.py", - "stat" - ], - "cwd": "[CACHE]/goma", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Goma" - }, - "infra_step": true, - "name": "print goma stats" - }, - { - "cmd": [ - "python", - "-u", - "goma_ctl.py", - "ensure_stop" - ], - "cwd": "[CACHE]/goma", - "env": { - "BUILDTYPE": "Release_x64", - "CHROME_HEADLESS": "1", - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "[START_DIR]/tmp/jwt_service_account_goma-client.json", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86_64-Release-Goma" - }, - "infra_step": true, - "name": "stop goma" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py index 350a0e88d6..b5ac5cdc53 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.py +++ b/infra/bots/recipe_modules/flavor/examples/full.py @@ -83,10 +83,7 @@ TEST_BUILDERS = [ 'Build-Win-Clang-arm64-Release-Android', 'Build-Win-Clang-x86-Debug-Exceptions', 'Build-Win-Clang-x86_64-Debug-GDI', - 'Build-Win-Clang-x86_64-Debug-GomaNoFallback', 'Build-Win-Clang-x86_64-Release', - 'Build-Win-Clang-x86_64-Release-ANGLE_Goma', - 'Build-Win-Clang-x86_64-Release-Goma', 'Build-Win-Clang-x86_64-Release-Vulkan', 'Housekeeper-PerCommit-CheckGeneratedFiles', 'Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android', diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 115cb2aaff..d41a76e575 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -22,36 +22,6 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): '--output-dir', self.m.vars.skia_out.join(self.m.vars.configuration), '--no-sync', '--no-hooks', '--make-output-dir']) - def _get_goma_json(self): - json_key = 'jwt_service_account_goma-client' - json_filename = json_key + '.json' - - # Ensure that the tmp_dir exists. - self.m.run.run_once(self.m.file.ensure_directory, - 'makedirs tmp_dir', - self.m.vars.tmp_dir) - - json_file = self.m.vars.tmp_dir.join(json_filename) - self.m.python.inline( - 'download ' + json_filename, - """ -import os -import sys -import urllib2 - -TOKEN_URL = ( - 'http://metadata/computeMetadata/v1/project/attributes/%s') - -req = urllib2.Request(TOKEN_URL, headers={'Metadata-Flavor': 'Google'}) -contents = urllib2.urlopen(req).read() - -with open(sys.argv[1], 'w') as f: - f.write(contents) -""" % json_key, - args=[json_file], - infra_step=True) - return json_file - def compile(self, unused_target): """Build Skia with GN.""" compiler = self.m.vars.builder_cfg.get('compiler', '') @@ -60,7 +30,6 @@ with open(sys.argv[1], 'w') as f: os = self.m.vars.builder_cfg.get('os', '') target_arch = self.m.vars.builder_cfg.get('target_arch', '') - goma_dir = None clang_linux = str(self.m.vars.slave_dir.join('clang_linux')) emscripten_sdk = str(self.m.vars.slave_dir.join('emscripten_sdk')) linux_vulkan_sdk = str(self.m.vars.slave_dir.join('linux_vulkan_sdk')) @@ -116,7 +85,6 @@ with open(sys.argv[1], 'w') as f: extra_ldflags.append('-L' + clang_linux + '/msan') args = {} - ninja_args = ['-k', '0', '-C', self.out_dir] env = {} if configuration != 'Debug': @@ -189,26 +157,6 @@ with open(sys.argv[1], 'w') as f: 'skia_use_icu': 'false', 'skia_enable_gpu': 'false', }) - if 'Goma' in extra_tokens or 'GomaNoFallback' in extra_tokens: - json_file = self._get_goma_json() - self.m.cipd.set_service_account_credentials(json_file) - goma_package = ('infra_internal/goma/client/%s' % - self.m.cipd.platform_suffix()) - goma_dir = self.m.path['cache'].join('goma') - self.m.cipd.ensure(goma_dir, {goma_package: 'release'}) - env['GOMA_SERVICE_ACCOUNT_JSON_FILE'] = json_file - if 'GomaNoFallback' in extra_tokens: - env['GOMA_HERMETIC'] = 'error' - env['GOMA_USE_LOCAL'] = '0' - env['GOMA_FALLBACK'] = '0' - with self.m.context(cwd=goma_dir, env=env): - self._py('start goma', 'goma_ctl.py', args=['ensure_start']) - args['cc_wrapper'] = '"%s"' % goma_dir.join('gomacc') - if 'ANGLE' in extra_tokens and 'Win' in os: - # ANGLE uses case-insensitive include paths in D3D code. Not sure why - # only Goma warns about this. - extra_cflags.append('-Wno-nonportable-include-path') - ninja_args.extend(['-j', '2000']) sanitize = '' for t in extra_tokens: @@ -240,31 +188,20 @@ with open(sys.argv[1], 'w') as f: ninja = 'ninja.exe' if 'Win' in os else 'ninja' gn = self.m.vars.skia_dir.join('bin', gn) - try: - with self.m.context(cwd=self.m.vars.skia_dir): - self._py('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn')) - if 'CheckGeneratedFiles' in extra_tokens: - env['PATH'] = '%s:%%(PATH)s' % self.m.vars.skia_dir.join('bin') - self._py( - 'fetch-clang-format', - self.m.vars.skia_dir.join('bin', 'fetch-clang-format')) - if target_arch == 'wasm': - fastcomp = emscripten_sdk + '/clang/fastcomp/build_incoming_64/bin' - env['PATH'] = '%s:%%(PATH)s' % fastcomp - - with self.m.env(env): - self._run('gn gen', [gn, 'gen', self.out_dir, '--args=' + gn_args]) - self._run('ninja', [ninja] + ninja_args) - finally: - if goma_dir: - with self.m.context(cwd=goma_dir, env=env): - self.m.run(self.m.python, 'print goma stats', - script='goma_ctl.py', args=['stat'], infra_step=True, - abort_on_failure=False, fail_build_on_failure=False) - self.m.run(self.m.python, 'stop goma', - script='goma_ctl.py', args=['ensure_stop'], - infra_step=True, - abort_on_failure=False, fail_build_on_failure=False) + with self.m.context(cwd=self.m.vars.skia_dir): + self._py('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn')) + if 'CheckGeneratedFiles' in extra_tokens: + env['PATH'] = '%s:%%(PATH)s' % self.m.vars.skia_dir.join('bin') + self._py( + 'fetch-clang-format', + self.m.vars.skia_dir.join('bin', 'fetch-clang-format')) + if target_arch == 'wasm': + fastcomp = emscripten_sdk + '/clang/fastcomp/build_incoming_64/bin' + env['PATH'] = '%s:%%(PATH)s' % fastcomp + + with self.m.env(env): + self._run('gn gen', [gn, 'gen', self.out_dir, '--args=' + gn_args]) + self._run('ninja', [ninja, '-k', '0', '-C', self.out_dir]) def step(self, name, cmd): app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0]) diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 94e5ab069e..06f05c9474 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -485,24 +485,6 @@ "Build-Win-Clang-x86_64-Debug-ANGLE" ] }, - "Build-Win-Clang-x86_64-Debug-ANGLE_Goma": { - "priority": 0.8, - "tasks": [ - "Build-Win-Clang-x86_64-Debug-ANGLE_Goma" - ] - }, - "Build-Win-Clang-x86_64-Debug-Goma": { - "priority": 0.8, - "tasks": [ - "Build-Win-Clang-x86_64-Debug-Goma" - ] - }, - "Build-Win-Clang-x86_64-Debug-GomaNoFallback": { - "priority": 0.8, - "tasks": [ - "Build-Win-Clang-x86_64-Debug-GomaNoFallback" - ] - }, "Build-Win-Clang-x86_64-Debug-UBSAN": { "priority": 0.8, "tasks": [ @@ -515,12 +497,6 @@ "Build-Win-Clang-x86_64-Debug-Vulkan" ] }, - "Build-Win-Clang-x86_64-Debug-Vulkan_Goma": { - "priority": 0.8, - "tasks": [ - "Build-Win-Clang-x86_64-Debug-Vulkan_Goma" - ] - }, "Build-Win-Clang-x86_64-Release": { "priority": 0.8, "tasks": [ @@ -533,18 +509,6 @@ "Build-Win-Clang-x86_64-Release-ANGLE" ] }, - "Build-Win-Clang-x86_64-Release-ANGLE_Goma": { - "priority": 0.8, - "tasks": [ - "Build-Win-Clang-x86_64-Release-ANGLE_Goma" - ] - }, - "Build-Win-Clang-x86_64-Release-Goma": { - "priority": 0.8, - "tasks": [ - "Build-Win-Clang-x86_64-Release-Goma" - ] - }, "Build-Win-Clang-x86_64-Release-UBSAN": { "priority": 0.8, "tasks": [ @@ -557,12 +521,6 @@ "Build-Win-Clang-x86_64-Release-Vulkan" ] }, - "Build-Win-Clang-x86_64-Release-Vulkan_Goma": { - "priority": 0.8, - "tasks": [ - "Build-Win-Clang-x86_64-Release-Vulkan_Goma" - ] - }, "Build-Win-MSVC-x86-Debug": { "priority": 0.8, "tasks": [ @@ -1458,24 +1416,12 @@ "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE" ] }, - "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma": { - "priority": 0.8, - "tasks": [ - "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma" - ] - }, "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "priority": 0.8, "tasks": [ "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan" ] }, - "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma": { - "priority": 0.8, - "tasks": [ - "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma" - ] - }, "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "priority": 0.8, "tasks": [ @@ -2824,24 +2770,12 @@ "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE" ] }, - "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma": { - "priority": 0.8, - "tasks": [ - "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma" - ] - }, "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "priority": 0.8, "tasks": [ "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan" ] }, - "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma": { - "priority": 0.8, - "tasks": [ - "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma" - ] - }, "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump": { "priority": 0.8, "tasks": [ @@ -5600,108 +5534,6 @@ "isolate": "compile_skia.isolate", "priority": 0.8 }, - "Build-Win-Clang-x86_64-Debug-ANGLE_Goma": { - "cipd_packages": [ - { - "name": "skia/bots/clang_win", - "path": "clang_win", - "version": "version:4" - } - ], - "dependencies": [ - "Housekeeper-PerCommit-IsolateWinToolchain" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-standard-16", - "os:Windows-2016Server-14393", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "compile", - "repository=<(REPO)", - "buildername=Build-Win-Clang-x86_64-Debug-ANGLE_Goma", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "isolate": "compile_skia.isolate", - "priority": 0.8 - }, - "Build-Win-Clang-x86_64-Debug-Goma": { - "cipd_packages": [ - { - "name": "skia/bots/clang_win", - "path": "clang_win", - "version": "version:4" - } - ], - "dependencies": [ - "Housekeeper-PerCommit-IsolateWinToolchain" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-standard-16", - "os:Windows-2016Server-14393", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "compile", - "repository=<(REPO)", - "buildername=Build-Win-Clang-x86_64-Debug-Goma", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "isolate": "compile_skia.isolate", - "priority": 0.8 - }, - "Build-Win-Clang-x86_64-Debug-GomaNoFallback": { - "cipd_packages": [ - { - "name": "skia/bots/clang_win", - "path": "clang_win", - "version": "version:4" - } - ], - "dependencies": [ - "Housekeeper-PerCommit-IsolateWinToolchain" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-standard-16", - "os:Windows-2016Server-14393", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "compile", - "repository=<(REPO)", - "buildername=Build-Win-Clang-x86_64-Debug-GomaNoFallback", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "isolate": "compile_skia.isolate", - "priority": 0.8 - }, "Build-Win-Clang-x86_64-Debug-UBSAN": { "cipd_packages": [ { @@ -5771,41 +5603,6 @@ "isolate": "compile_skia.isolate", "priority": 0.8 }, - "Build-Win-Clang-x86_64-Debug-Vulkan_Goma": { - "cipd_packages": [ - { - "name": "skia/bots/clang_win", - "path": "clang_win", - "version": "version:4" - } - ], - "dependencies": [ - "Housekeeper-PerCommit-IsolateWinToolchain", - "Housekeeper-PerCommit-IsolateWinVulkanSDK" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-standard-16", - "os:Windows-2016Server-14393", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "compile", - "repository=<(REPO)", - "buildername=Build-Win-Clang-x86_64-Debug-Vulkan_Goma", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "isolate": "compile_skia.isolate", - "priority": 0.8 - }, "Build-Win-Clang-x86_64-Release": { "cipd_packages": [ { @@ -5874,74 +5671,6 @@ "isolate": "compile_skia.isolate", "priority": 0.8 }, - "Build-Win-Clang-x86_64-Release-ANGLE_Goma": { - "cipd_packages": [ - { - "name": "skia/bots/clang_win", - "path": "clang_win", - "version": "version:4" - } - ], - "dependencies": [ - "Housekeeper-PerCommit-IsolateWinToolchain" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-standard-16", - "os:Windows-2016Server-14393", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "compile", - "repository=<(REPO)", - "buildername=Build-Win-Clang-x86_64-Release-ANGLE_Goma", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "isolate": "compile_skia.isolate", - "priority": 0.8 - }, - "Build-Win-Clang-x86_64-Release-Goma": { - "cipd_packages": [ - { - "name": "skia/bots/clang_win", - "path": "clang_win", - "version": "version:4" - } - ], - "dependencies": [ - "Housekeeper-PerCommit-IsolateWinToolchain" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-standard-16", - "os:Windows-2016Server-14393", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "compile", - "repository=<(REPO)", - "buildername=Build-Win-Clang-x86_64-Release-Goma", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "isolate": "compile_skia.isolate", - "priority": 0.8 - }, "Build-Win-Clang-x86_64-Release-UBSAN": { "cipd_packages": [ { @@ -6011,41 +5740,6 @@ "isolate": "compile_skia.isolate", "priority": 0.8 }, - "Build-Win-Clang-x86_64-Release-Vulkan_Goma": { - "cipd_packages": [ - { - "name": "skia/bots/clang_win", - "path": "clang_win", - "version": "version:4" - } - ], - "dependencies": [ - "Housekeeper-PerCommit-IsolateWinToolchain", - "Housekeeper-PerCommit-IsolateWinVulkanSDK" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "machine_type:n1-standard-16", - "os:Windows-2016Server-14393", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "compile", - "repository=<(REPO)", - "buildername=Build-Win-Clang-x86_64-Release-Vulkan_Goma", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "isolate": "compile_skia.isolate", - "priority": 0.8 - }, "Build-Win-MSVC-x86-Debug": { "dependencies": [ "Housekeeper-PerCommit-IsolateWinToolchain" @@ -11835,53 +11529,6 @@ "max_attempts": 1, "priority": 0.8 }, - "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:34" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:116" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:9" - } - ], - "dependencies": [ - "Build-Win-Clang-x86_64-Debug-ANGLE_Goma", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "gpu:10de:1cb3-22.21.13.8205", - "os:Windows-10-15063", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "perf", - "repository=<(REPO)", - "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "io_timeout_ns": 2400000000000, - "isolate": "perf_skia_bundled_win.isolate", - "max_attempts": 1, - "priority": 0.8 - }, "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { @@ -11929,53 +11576,6 @@ "max_attempts": 1, "priority": 0.8 }, - "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:34" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:116" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:9" - } - ], - "dependencies": [ - "Build-Win-Clang-x86_64-Debug-Vulkan_Goma", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "gpu:10de:1cb3-22.21.13.8205", - "os:Windows-10-15063", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "perf", - "repository=<(REPO)", - "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "io_timeout_ns": 2400000000000, - "isolate": "perf_skia_bundled_win.isolate", - "max_attempts": 1, - "priority": 0.8 - }, "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": { "cipd_packages": [ { @@ -22114,54 +21714,6 @@ "max_attempts": 1, "priority": 0.8 }, - "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:34" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:116" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:9" - } - ], - "dependencies": [ - "Build-Win-Clang-x86_64-Debug-ANGLE_Goma", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "gpu:10de:1cb3-22.21.13.8205", - "os:Windows-10-15063", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "test", - "repository=<(REPO)", - "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", - "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "io_timeout_ns": 2400000000000, - "isolate": "test_skia_bundled_win.isolate", - "max_attempts": 1, - "priority": 0.8 - }, "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "cipd_packages": [ { @@ -22210,54 +21762,6 @@ "max_attempts": 1, "priority": 0.8 }, - "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:34" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:116" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:9" - } - ], - "dependencies": [ - "Build-Win-Clang-x86_64-Debug-Vulkan_Goma", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "gpu:10de:1cb3-22.21.13.8205", - "os:Windows-10-15063", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "test", - "repository=<(REPO)", - "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", - "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "io_timeout_ns": 2400000000000, - "isolate": "test_skia_bundled_win.isolate", - "max_attempts": 1, - "priority": 0.8 - }, "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump": { "cipd_packages": [ { @@ -32752,33 +32256,6 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, - "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma": { - "dependencies": [ - "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "os:Debian-9.2", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "upload_dm_results", - "repository=<(REPO)", - "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE_Goma", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)", - "gs_bucket=skia-infra-gm" - ], - "isolate": "upload_dm_results.isolate", - "priority": 0.8 - }, "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": { "dependencies": [ "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan" @@ -32806,33 +32283,6 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, - "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma": { - "dependencies": [ - "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "os:Debian-9.2", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "upload_dm_results", - "repository=<(REPO)", - "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Goma", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)", - "gs_bucket=skia-infra-gm" - ], - "isolate": "upload_dm_results.isolate", - "priority": 0.8 - }, "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump": { "dependencies": [ "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump" |