| Index: scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
|
| index dc24bafdcd1c606e648810ee41bb4a670c5677e5..5f099e92b58531aa2b6cc04445b56642de70d9e8 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
|
| @@ -4,7 +4,7 @@
|
| "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_chromium_rel_ng",
|
| + "[BUILDER_CACHE]/linux",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -52,7 +52,7 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -190,7 +190,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/swarming_client/swarming.py",
|
| + "[BUILDER_CACHE]/linux/src/tools/swarming_client/swarming.py",
|
| "--version"
|
| ],
|
| "name": "swarming.py --version",
|
| @@ -206,7 +206,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -219,7 +219,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/linux/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -227,7 +227,7 @@
|
| "Release",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/linux_chromium_rel_ng/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]/linux/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"linux_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| ],
|
| @@ -242,12 +242,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/testing/buildbot/chromium.gpu.json",
|
| + "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.gpu.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.gpu.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux_chromium_rel_ng/src/testing/buildbot/chromium.gpu.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.gpu.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -257,12 +257,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/testing/buildbot/chromium.linux.json",
|
| + "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.linux.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux_chromium_rel_ng/src/testing/buildbot/chromium.linux.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"Linux Tests\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| @@ -288,7 +288,7 @@
|
| "--cached",
|
| "--name-only"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "name": "git diff to analyze patch",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -302,7 +302,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/testing/buildbot/trybot_analyze_config.json",
|
| + "[BUILDER_CACHE]/linux/src/testing/buildbot/trybot_analyze_config.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read filter exclusion spec",
|
| @@ -375,7 +375,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/out/Release",
|
| + "[BUILDER_CACHE]/linux/src/out/Release",
|
| "--clean-isolated-files"
|
| ],
|
| "name": "clean isolated files"
|
| @@ -384,21 +384,21 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "tryserver.chromium.linux",
|
| "-b",
|
| "linux_chromium_rel_ng",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "--swarming-targets-file",
|
| "gl_tests\n",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -423,7 +423,7 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src",
|
| + "[BUILDER_CACHE]/linux/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -459,9 +459,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/out/Release",
|
| + "[BUILDER_CACHE]/linux/src/out/Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src"
|
| + "[BUILDER_CACHE]/linux/src"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "remove_build_metadata"
|
| @@ -471,14 +471,14 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/isolate.py",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/swarming_client",
|
| + "[BUILDER_CACHE]/linux/src/tools/swarming_client",
|
| "batcharchive",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/out/Release/gl_tests.isolated.gen.json"
|
| + "[BUILDER_CACHE]/linux/src/out/Release/gl_tests.isolated.gen.json"
|
| ],
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| @@ -500,7 +500,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/swarming_client/swarming.py",
|
| + "[BUILDER_CACHE]/linux/src/tools/swarming_client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -565,7 +565,7 @@
|
| "--",
|
| "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -594,7 +594,7 @@
|
| "python",
|
| "RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
|
| "--swarming-client-dir",
|
| - "[BUILDER_CACHE]/linux_chromium_rel_ng/src/tools/swarming_client",
|
| + "[BUILDER_CACHE]/linux/src/tools/swarming_client",
|
| "--temp-root-dir",
|
| "[TMP_BASE]",
|
| "--merged-test-output",
|
| @@ -608,7 +608,7 @@
|
| "--json",
|
| "{\"base_task_name\": \"gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\", \"tasks\": {\"gl_tests (with patch)/Ubuntu-12.04/[dummy has/linux_chromium_rel_ng/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -637,7 +637,7 @@
|
| "--chrome-revision",
|
| "170242"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/linux_chromium_rel_ng",
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
|
|