Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(537)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json

Issue 2242213007: Try to use bot_update in Skia repo recipes Base URL: https://skia.googlesource.com/skia@master
Patch Set: Update expectations Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json ('k') | infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json
diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json
index 7c93b740b0436381a07b44b18d2cd3b98e486494..b190cfa140ec540e56c2295b8b3c6a6359029252 100644
--- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json
+++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json
@@ -25,53 +25,61 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
- "config",
+ "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
+ "--master",
+ "client.skia",
+ "--builder",
+ "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
+ "--slave",
+ "skiabot-linux-swarm-000",
"--spec",
- "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
- ],
- "cwd": "[CUSTOM_/_B_WORK]",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[SLAVE_BUILD]/out"
- },
- "name": "gclient setup"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
- "sync",
- "--nohooks",
- "--force",
- "--verbose",
- "--delete_unversioned_trees",
+ "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']",
+ "--root",
+ "skia",
+ "--revision_mapping_file",
+ "{\"skia\": \"got_revision\"}",
+ "--git-cache-dir",
+ "[CUSTOM_/_B_CACHE]",
+ "--output_json",
+ "/path/to/tmp/json",
"--revision",
"skia@abc123",
- "--output-json",
- "/path/to/tmp/json"
+ "--force",
+ "--output_manifest"
],
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
- "name": "gclient sync",
+ "name": "bot_update",
"~followup_annotations": [
+ "@@@STEP_TEXT@Some step text@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 164710@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/skia.git\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"skia\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@164710@@@"
+ "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
]
},
{
@@ -106,7 +114,7 @@
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"CHROME_PATH": "[SLAVE_BUILD]/src",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "build dm"
@@ -440,7 +448,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json"
],
"name": "Write ct-dm-1.isolated.gen.json"
@@ -538,7 +546,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json"
],
"name": "Write ct-dm-2.isolated.gen.json"
@@ -636,7 +644,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json"
],
"name": "Write ct-dm-3.isolated.gen.json"
@@ -734,7 +742,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json"
],
"name": "Write ct-dm-4.isolated.gen.json"
@@ -832,7 +840,7 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
+ "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}",
"[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json"
],
"name": "Write ct-dm-5.isolated.gen.json"
« no previous file with comments | « infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json ('k') | infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698