| Index: scripts/slave/recipes/chromium.expected/full_chromium_gpu_GPU_Fake_Linux_Builder.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_angle_Linux_Builder__ANGLE_.json b/scripts/slave/recipes/chromium.expected/full_chromium_gpu_GPU_Fake_Linux_Builder.json
|
| similarity index 90%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_angle_Linux_Builder__ANGLE_.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_gpu_GPU_Fake_Linux_Builder.json
|
| index 91cbc4a78fbb765866806799217a25aa17884965..e0f68c91f48bf41802bc133022ba4534408fba10 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_angle_Linux_Builder__ANGLE_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_gpu_GPU_Fake_Linux_Builder.json
|
| @@ -5,9 +5,9 @@
|
| "-u",
|
| "[BUILD]/scripts/slave/bot_update.py",
|
| "--master",
|
| - "chromium.angle",
|
| + "chromium.gpu",
|
| "--builder",
|
| - "Linux Builder (ANGLE)",
|
| + "GPU Fake Linux Builder",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -20,8 +20,6 @@
|
| "/path/to/tmp/json",
|
| "--revision",
|
| "src@HEAD",
|
| - "--revision",
|
| - "src/third_party/angle@HEAD",
|
| "--output_manifest"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -114,7 +112,7 @@
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1"
|
| + "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -123,15 +121,15 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.angle.json",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/chromium.gpu.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.angle.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.gpu.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"Linux Tests (ANGLE)\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Fake Linux Release (NVIDIA)\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
|
| @@ -155,10 +153,11 @@
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| + "--use-src-side-runtest-py",
|
| "--paths",
|
| "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Linux Builder (ANGLE)\", \"buildnumber\": 571, \"mastername\": \"chromium.angle\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| + "{\"buildername\": \"GPU Fake Linux Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| @@ -195,9 +194,9 @@
|
| "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| - "chromium.angle",
|
| + "chromium.gpu",
|
| "-b",
|
| - "Linux Builder (ANGLE)",
|
| + "GPU Fake Linux Builder",
|
| "--config-file",
|
| "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| @@ -283,13 +282,13 @@
|
| "--target",
|
| "Release",
|
| "--build-url",
|
| - "gs://chromium-fyi-archive/chromium.angle/Linux Builder (ANGLE)",
|
| + "gs://chromium-gpu-archive/chromium.gpu/GPU Fake Linux Builder",
|
| "--build_revision",
|
| "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux Builder (ANGLE)\", \"buildnumber\": 571, \"mastername\": \"chromium.angle\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"GPU Fake Linux Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux Builder (ANGLE)\", \"buildnumber\": 571, \"mastername\": \"chromium.angle\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"GPU Fake Linux Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.gpu\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "package build"
|
| @@ -300,7 +299,7 @@
|
| "name": "trigger",
|
| "trigger_specs": [
|
| {
|
| - "builder_name": "Linux Tests (ANGLE)",
|
| + "builder_name": "Fake Linux Release (NVIDIA)",
|
| "properties": {
|
| "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
|
| "parent_got_angle_revision_cp": "refs/heads/master@{#297276}",
|
| @@ -318,7 +317,7 @@
|
| }
|
| ],
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@Linux Tests (ANGLE)@@@"
|
| + "@@@STEP_TEXT@Fake Linux Release (NVIDIA)@@@"
|
| ]
|
| },
|
| {
|
|
|