| Index: scripts/slave/recipes/findit/chromium/compile.expected/compile_specified_targets.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_tryserver_chromium_linux_linux_full_bisect_builder.json b/scripts/slave/recipes/findit/chromium/compile.expected/compile_specified_targets.json
|
| similarity index 83%
|
| copy from scripts/slave/recipes/chromium.expected/full_tryserver_chromium_linux_linux_full_bisect_builder.json
|
| copy to scripts/slave/recipes/findit/chromium/compile.expected/compile_specified_targets.json
|
| index 4bec0d0bfe24fe5f2378e5084a7936c093a0a802..f97a290ce1087c59ec537e6858515eb746e1939b 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_tryserver_chromium_linux_linux_full_bisect_builder.json
|
| +++ b/scripts/slave/recipes/findit/chromium/compile.expected/compile_specified_targets.json
|
| @@ -1,5 +1,10 @@
|
| [
|
| {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "test r1"
|
| + },
|
| + {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| @@ -7,9 +12,9 @@
|
| "--master",
|
| "tryserver.chromium.linux",
|
| "--builder",
|
| - "linux_full_bisect_builder",
|
| + "linux_variable",
|
| "--slave",
|
| - "TestSlavename",
|
| + "build1-a1",
|
| "--spec",
|
| "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
|
| "--root",
|
| @@ -19,12 +24,13 @@
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| - "src@HEAD",
|
| + "src@r1",
|
| "--output_manifest"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "bot_update",
|
| + "name": "test r1.bot_update",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_TEXT@Some step text@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| @@ -96,9 +102,10 @@
|
| "--version"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "swarming.py --version",
|
| + "name": "test r1.swarming.py --version",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_TEXT@0.4.10@@@"
|
| ]
|
| },
|
| @@ -114,20 +121,24 @@
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1"
|
| },
|
| - "name": "gclient runhooks"
|
| + "name": "test r1.gclient runhooks",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/tryserver.chromium.linux.json",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "read test spec",
|
| + "name": "test r1.read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/tryserver.chromium.linux.json@@@",
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -146,11 +157,12 @@
|
| "--paths",
|
| "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
|
| "--properties",
|
| - "{\"buildername\": \"linux_full_bisect_builder\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| + "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "get compile targets for scripts",
|
| + "name": "test r1.get compile targets for scripts",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -162,7 +174,10 @@
|
| "[BUILD]/scripts/slave/cleanup_temp.py"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "cleanup_temp"
|
| + "name": "test r1.cleanup_temp",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -171,9 +186,9 @@
|
| "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| - "tryserver.chromium.linux",
|
| + "chromium.linux",
|
| "-b",
|
| - "linux_full_bisect_builder",
|
| + "Linux Builder",
|
| "--config-file",
|
| "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| @@ -181,7 +196,10 @@
|
| "//out/Release"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "generate_build_files"
|
| + "name": "test r1.generate_build_files",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -202,32 +220,34 @@
|
| "[BUILD]/goma",
|
| "--ninja-ensure-up-to-date",
|
| "--",
|
| - "chromium_swarm_tests"
|
| + "target_name"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "compile",
|
| + "name": "test r1.compile",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| "@@@STEP_LOG_END@json.output (invalid)@@@"
|
| ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/zip_build.py",
|
| - "--target",
|
| - "Release",
|
| - "--build_revision",
|
| - "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"linux_full_bisect_builder\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"linux_full_bisect_builder\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| + "import sys; sys.exit(0)"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "package build"
|
| + "name": "report",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@result@[@@@",
|
| + "@@@STEP_LOG_LINE@result@ [@@@",
|
| + "@@@STEP_LOG_LINE@result@ \"r1\", @@@",
|
| + "@@@STEP_LOG_LINE@result@ \"passed\"@@@",
|
| + "@@@STEP_LOG_LINE@result@ ]@@@",
|
| + "@@@STEP_LOG_LINE@result@]@@@",
|
| + "@@@STEP_LOG_END@result@@@",
|
| + "@@@SET_BUILD_PROPERTY@result@[[\"r1\", \"passed\"]]@@@"
|
| + ]
|
| },
|
| {
|
| "name": "$result",
|
|
|