| 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 9ca2b582c64a76f26722e21eb842bad150f4dd20..7256fa2ce275beda1e8c758ef4dd78829fa126c6 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,104 +25,60 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "config",
|
| + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--spec",
|
| - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]"
|
| - ],
|
| - "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",
|
| - "--verbose",
|
| - "--with_branch_heads",
|
| - "--nohooks",
|
| - "-j8",
|
| - "--reset",
|
| - "--force",
|
| - "--upstream",
|
| - "--no-nag-max",
|
| - "--delete_unversioned_trees",
|
| + "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
|
| + "--patch_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"
|
| + "--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@ \"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@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@"
|
| + "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "recurse",
|
| - "git",
|
| - "config",
|
| - "user.name",
|
| - "local_bot"
|
| - ],
|
| - "cwd": "[CUSTOM_/_B_WORK]",
|
| - "env": {
|
| - "BUILDTYPE": "Debug",
|
| - "CHROME_HEADLESS": "1",
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| - },
|
| - "name": "gclient recurse (git config user.name)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "recurse",
|
| - "git",
|
| - "config",
|
| - "user.email",
|
| - "local_bot@example.com"
|
| - ],
|
| - "cwd": "[CUSTOM_/_B_WORK]",
|
| - "env": {
|
| - "BUILDTYPE": "Debug",
|
| - "CHROME_HEADLESS": "1",
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
|
| - "SKIA_OUT": "[SLAVE_BUILD]/out"
|
| - },
|
| - "name": "gclient recurse (git config user.email)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| "[SLAVE_BUILD]/tmp",
|
| "511"
|
| @@ -149,7 +105,7 @@
|
| ],
|
| "cwd": "[CUSTOM_/_B_WORK]/skia",
|
| "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "fetch-gn"
|
| },
|
| @@ -162,7 +118,7 @@
|
| ],
|
| "cwd": "[CUSTOM_/_B_WORK]/skia",
|
| "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gn gen"
|
| },
|
| @@ -174,7 +130,7 @@
|
| ],
|
| "cwd": "[CUSTOM_/_B_WORK]/skia",
|
| "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "ninja"
|
| },
|
|
|