| Index: scripts/slave/recipes/infra/recipe_simulation.expected/normal.json
|
| diff --git a/scripts/slave/recipes/infra/recipe_simulation.expected/normal.json b/scripts/slave/recipes/infra/recipe_simulation.expected/normal.json
|
| index 04460184818160c9a5ab208ef774e831fc80ab9d..e55aac3d33fe00cfb2784361876de7dceb812e19 100644
|
| --- a/scripts/slave/recipes/infra/recipe_simulation.expected/normal.json
|
| +++ b/scripts/slave/recipes/infra/recipe_simulation.expected/normal.json
|
| @@ -11,20 +11,21 @@
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
|
| + "cache_dir = '[SLAVE_BUILD]/_cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]",
|
| "--root",
|
| - "build",
|
| + "infra",
|
| "--revision_mapping_file",
|
| - "{\"build\": \"got_revision\"}",
|
| + "{\"infra\": \"got_revision\"}",
|
| "--git-cache-dir",
|
| - "[GIT_CACHE]",
|
| + "[SLAVE_BUILD]/_cache_dir",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| - "build@deadbeaf",
|
| + "infra@origin/master",
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]/custom_infra",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -34,43 +35,107 @@
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"build\": \"deadbeaf\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"infra\": \"origin/master\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"build\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/build.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"80754af91bfb6d1073585b046fe0a474ce868509\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@",
|
| "@@@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\": \"build\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"infra\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"80754af91bfb6d1073585b046fe0a474ce868509\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#270553}\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#197293}\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"root\": \"build\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"root\": \"infra\", @@@",
|
| "@@@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@\"80754af91bfb6d1073585b046fe0a474ce868509\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#270553}\"@@@"
|
| + "@@@SET_BUILD_PROPERTY@got_revision@\"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#197293}\"@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/build/scripts/slave/recipes.py",
|
| - "fetch"
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/tools/pycurl.py",
|
| + "https://luci-config.appspot.com/_ah/api/config/v1/projects",
|
| + "--outfile",
|
| + "/path/to/tmp/",
|
| + "--attempts",
|
| + "3"
|
| ],
|
| - "name": "recipe fetch deps"
|
| + "name": "Get luci-config projects"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/build/scripts/slave/unittests/recipe_simulation_test.py",
|
| - "test"
|
| + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| + "--master",
|
| + "chromium.tools.build",
|
| + "--builder",
|
| + "recipe simulation tester",
|
| + "--slave",
|
| + "TestSlavename",
|
| + "--spec",
|
| + "cache_dir = '[SLAVE_BUILD]/_cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'build', 'url': 'https://repo.repo/build'}]",
|
| + "--root",
|
| + "build",
|
| + "--revision_mapping_file",
|
| + "{}",
|
| + "--git-cache-dir",
|
| + "[SLAVE_BUILD]/_cache_dir",
|
| + "--output_json",
|
| + "/path/to/tmp/json",
|
| + "--revision",
|
| + "build@deadbeaf",
|
| + "--force",
|
| + "--output_manifest"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "env": {
|
| + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + },
|
| + "name": "bot_update (2)",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@Some step text@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"build\": \"deadbeaf\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"manifest\": {}, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"build\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"properties\": {}, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"root\": \"build\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/tools/pycurl.py",
|
| + "https://luci-config.appspot.com//_ah/api/config/v1/config_sets/projects%2Fbuild%2Frefs%2Fheads%2Fmaster/config/recipes.cfg",
|
| + "--outfile",
|
| + "/path/to/tmp/",
|
| + "--attempts",
|
| + "3"
|
| + ],
|
| + "name": "Get project 'build' config 'recipes.cfg'"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "[SLAVE_BUILD]/custom_infra/ENV/bin/python",
|
| + "[SLAVE_BUILD]/build/foobar/recipes.py",
|
| + "simulation_test"
|
| ],
|
| "name": "recipe simulation test"
|
| },
|
|
|