| Index: infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit-Presubmit.json
|
| diff --git a/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit-Presubmit.json
|
| similarity index 85%
|
| copy from infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json
|
| copy to infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit-Presubmit.json
|
| index 9d7ca5ee52fbf33b4ec4c3b6943c4750668abb47..13a0e48c483db7fdd343051c7b8d97b04a9ea7e1 100644
|
| --- a/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json
|
| +++ b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit-Presubmit.json
|
| @@ -4,7 +4,7 @@
|
| "python",
|
| "-u",
|
| "\nimport json\nimport sys\n\nwith open(sys.argv[1]) as f:\n content = json.load(f)\n\nprint json.dumps(content, indent=2)\n",
|
| - "{\"buildername\": \"Infra-PerCommit\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
|
| + "{\"buildername\": \"Housekeeper-PerCommit-Presubmit\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
|
| ],
|
| "name": "print properties",
|
| "~followup_annotations": [
|
| @@ -284,10 +284,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/infra_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-infra_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/infra_skia.isolated.gen.json"
|
| + "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/presubmit_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-presubmit_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--blacklist\", \n \".recipe_deps\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/presubmit_skia.isolated.gen.json"
|
| ],
|
| - "name": "Write infra_skia.isolated.gen.json"
|
| + "name": "Write presubmit_skia.isolated.gen.json"
|
| },
|
| {
|
| "cmd": [
|
| @@ -301,15 +301,15 @@
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/infra_skia.isolated.gen.json"
|
| + "[SLAVE_BUILD]/swarming_temp_dir/presubmit_skia.isolated.gen.json"
|
| ],
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"infra_skia\": \"[dummy hash for infra_skia]\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"presubmit_skia\": \"[dummy hash for presubmit_skia]\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"infra_skia\": \"[dummy hash for infra_skia]\"}@@@"
|
| + "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"presubmit_skia\": \"[dummy hash for presubmit_skia]\"}@@@"
|
| ]
|
| },
|
| {
|
| @@ -327,7 +327,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "infra_skia/Ubuntu/[dummy has/Infra-PerCommit/5",
|
| + "presubmit_skia/Ubuntu/[dummy has/Housekeeper-PerCommit-Presubmit/5",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -348,15 +348,15 @@
|
| "--tag",
|
| "allow_milo:1",
|
| "--tag",
|
| - "buildername:Infra-PerCommit",
|
| + "buildername:Housekeeper-PerCommit-Presubmit",
|
| "--tag",
|
| "buildnumber:5",
|
| "--tag",
|
| - "data:[dummy hash for infra_skia]",
|
| + "data:[dummy hash for presubmit_skia]",
|
| "--tag",
|
| "master:client.skia",
|
| "--tag",
|
| - "name:infra_skia",
|
| + "name:presubmit_skia",
|
| "--tag",
|
| "os:Ubuntu",
|
| "--tag",
|
| @@ -364,13 +364,13 @@
|
| "--tag",
|
| "slavename:skiabot-linux-swarm-000",
|
| "--tag",
|
| - "stepname:infra_skia on Ubuntu",
|
| - "[dummy hash for infra_skia]",
|
| + "stepname:presubmit_skia on Ubuntu",
|
| + "[dummy hash for presubmit_skia]",
|
| "--",
|
| "--workdir",
|
| "../../..",
|
| - "swarm_infra",
|
| - "buildername=Infra-PerCommit",
|
| + "swarm_presubmit",
|
| + "buildername=Housekeeper-PerCommit-Presubmit",
|
| "mastername=client.skia",
|
| "buildnumber=5",
|
| "slavename=skiabot-linux-swarm-000",
|
| @@ -378,12 +378,12 @@
|
| "swarm_out_dir=${ISOLATED_OUTDIR}",
|
| "revision=abc123"
|
| ],
|
| - "name": "[trigger] infra_skia on Ubuntu",
|
| + "name": "[trigger] presubmit_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"infra_skia/Ubuntu/[dummy has/Infra-PerCommit/5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"presubmit_skia/Ubuntu/[dummy has/Housekeeper-PerCommit-Presubmit/5\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"infra_skia/Ubuntu/[dummy has/Infra-PerCommit/5\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"presubmit_skia/Ubuntu/[dummy has/Housekeeper-PerCommit-Presubmit/5\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
|
| @@ -406,11 +406,11 @@
|
| "--decorate",
|
| "--print-status-updates",
|
| "--json",
|
| - "{\"base_task_name\": \"infra_skia/Ubuntu/[dummy has/Infra-PerCommit/5\", \"tasks\": {\"infra_skia/Ubuntu/[dummy has/Infra-PerCommit/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
|
| + "{\"base_task_name\": \"presubmit_skia/Ubuntu/[dummy has/Housekeeper-PerCommit-Presubmit/5\", \"tasks\": {\"presubmit_skia/Ubuntu/[dummy has/Housekeeper-PerCommit-Presubmit/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
|
| "--task-summary-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "name": "infra_skia on Ubuntu",
|
| + "name": "presubmit_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
|
|