| Index: scripts/slave/recipe_modules/auto_bisect_staging/example.expected/bad_config.json
|
| diff --git a/scripts/slave/recipes/bisection/desktop_bisect_staging.expected/perf_cq_no_changes.json b/scripts/slave/recipe_modules/auto_bisect_staging/example.expected/bad_config.json
|
| similarity index 79%
|
| copy from scripts/slave/recipes/bisection/desktop_bisect_staging.expected/perf_cq_no_changes.json
|
| copy to scripts/slave/recipe_modules/auto_bisect_staging/example.expected/bad_config.json
|
| index 781a8d657a80d9b4a5e7395aecd3078638bd7b00..a8984f99e1fcc996313e555fcd1cb27d0f9bfdcb 100644
|
| --- a/scripts/slave/recipes/bisection/desktop_bisect_staging.expected/perf_cq_no_changes.json
|
| +++ b/scripts/slave/recipe_modules/auto_bisect_staging/example.expected/bad_config.json
|
| @@ -3,28 +3,6 @@
|
| "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",
|
| - "[BUILDER_CACHE]/linux_perf_bisect",
|
| - "511"
|
| - ],
|
| - "name": "makedirs checkout path",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--spec",
|
| "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}, {'deps_file': '.DEPS.git', 'managed': True, 'name': 'catapult', 'url': 'https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git'}]",
|
| @@ -34,19 +12,12 @@
|
| "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| "--git-cache-dir",
|
| "[GIT_CACHE]",
|
| - "--issue",
|
| - "12345",
|
| - "--patchset",
|
| - "20001",
|
| - "--rietveld_server",
|
| - "https://codereview.chromium.org",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_perf_bisect",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -191,29 +162,29 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_perf_bisect/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| - "name": "gclient runhooks (with patch)"
|
| + "name": "gclient runhooks"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/linux_perf_bisect/src/testing/scripts/get_compile_targets.py",
|
| + "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/linux_perf_bisect/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"linux_perf_bisect\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.perf\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| + "{\"buildername\": \"linux_perf_bisect\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.perf\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"dummyslave\", \"target_platform\": \"linux\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -226,69 +197,96 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/linux_perf_bisect/src/testing/buildbot/tryserver.chromium.perf.json",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/tryserver.chromium.perf.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (tryserver.chromium.perf.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux_perf_bisect/src/testing/buildbot/tryserver.chromium.perf.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/tryserver.chromium.perf.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| {
|
| "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",
|
| - "[BUILDER_CACHE]/linux_perf_bisect",
|
| - "511"
|
| - ],
|
| - "name": "makedirs checkout path (2)",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| "git",
|
| "diff",
|
| "--cached",
|
| "--name-only"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_perf_bisect/src",
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| "name": "git diff to analyze patch",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@files@tools/no_benchmark_file@@@",
|
| + "@@@STEP_LOG_LINE@files@foo.cc@@@",
|
| "@@@STEP_LOG_END@files@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [],
|
| - "cwd": "[BUILDER_CACHE]/linux_perf_bisect",
|
| - "name": "***PERF TRYJOB***"
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "***BISECT***"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "git",
|
| + "update-ref",
|
| + "refs/heads/master",
|
| + "refs/remotes/origin/master"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| + "name": "git update-ref"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "git",
|
| + "checkout",
|
| + "master"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/src",
|
| + "name": "git checkout"
|
| },
|
| {
|
| "cmd": [],
|
| - "cwd": "[BUILDER_CACHE]/linux_perf_bisect",
|
| - "name": "Results",
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "config",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@There are no modifications to Telemetry benchmarks, aborting the try job.@@@"
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@{@@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"bad_revision\": \"314016\", @@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"bug_id\": \"crbug.com/123123\", @@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"bypass_stats_check\": \"True\", @@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"command\": \"src/tools/perf/run_benchmark -v --browser=release --output-format=valueset smoothness.tough_scrolling_cases\", @@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"dummy_builds\": \"True\", @@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"dummy_job_names\": \"True\", @@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"dummy_tests\": \"True\", @@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"good_revision\": \"314015\", @@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"gs_bucket\": \"chrome-perf\", @@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"metric\": \"mean_input_event_latency/mean_input_event_latency\", @@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"recipe_tester_name\": \"linux_perf_tester\", @@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"skip_gclient_ops\": \"True\", @@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@ \"test_type\": \"perf\"@@@",
|
| + "@@@STEP_LOG_LINE@Bisect job configuration@}@@@",
|
| + "@@@STEP_LOG_END@Bisect job configuration@@@",
|
| + "@@@SET_BUILD_PROPERTY@extra_result_code@[\"B4T_BAD_CONFIG\"]@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "import sys; sys.exit(1)"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "Recipe failed. Reason: Invalid value 'crbug.com/123123' for \"bug_id\".",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@import sys; sys.exit(1)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| ]
|
| },
|
| {
|
| "name": "$result",
|
| + "reason": "Invalid value 'crbug.com/123123' for \"bug_id\".",
|
| "recipe_result": null,
|
| - "status_code": 0
|
| + "status_code": 1
|
| }
|
| ]
|
|
|