| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_WebKit_Linux___RandomOrder.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_WebKit_Linux___WPTServe.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_WebKit_Linux___RandomOrder.json
|
| similarity index 86%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_WebKit_Linux___WPTServe.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_WebKit_Linux___RandomOrder.json
|
| index af76e4490196a25cd592138b94087e99f4c3fe2d..2a12eb4636031c9fbb799f07a0ac7e5116685c13 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_WebKit_Linux___WPTServe.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_WebKit_Linux___RandomOrder.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]/WebKit_Linux___WPTServe",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -40,7 +40,7 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/WebKit_Linux___WPTServe",
|
| + "cwd": "[BUILDER_CACHE]/WebKit_Linux___RandomOrder",
|
| "env": {
|
| "GCLIENT_KILL_GIT_FETCH_AFTER": "1200",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| @@ -183,7 +183,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/tools/swarming_client/swarming.py",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/tools/swarming_client/swarming.py",
|
| "--version"
|
| ],
|
| "name": "swarming.py --version",
|
| @@ -199,7 +199,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src",
|
| + "cwd": "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -212,16 +212,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/WebKit_Linux___WPTServe/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"WebKit Linux - WPTServe\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| + "{\"buildername\": \"WebKit Linux - RandomOrder\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -234,14 +234,14 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/testing/buildbot/chromium.fyi.json",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.fyi.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/WebKit_Linux___WPTServe/src/testing/buildbot/chromium.fyi.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/testing/buildbot/chromium.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"WebKit Linux - WPTServe\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"WebKit Linux - RandomOrder\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
|
| @@ -272,7 +272,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/out/Release",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/out/Release",
|
| "--clean-isolated-files"
|
| ],
|
| "name": "clean isolated files"
|
| @@ -281,21 +281,21 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "chromium.fyi",
|
| "-b",
|
| - "WebKit Linux - WPTServe",
|
| + "WebKit Linux - RandomOrder",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "--swarming-targets-file",
|
| "browser_tests\n",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src",
|
| + "cwd": "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -320,17 +320,17 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "WebKit Linux - WPTServe",
|
| + "WebKit Linux - RandomOrder",
|
| "--buildbot-mastername",
|
| "chromium.fyi",
|
| "--buildbot-slavename",
|
| "TestSlavename",
|
| "--goma-deps-cache-file",
|
| - "WebKit_Linux___WPTServe.gomadeps",
|
| + "WebKit_Linux___RandomOrder.gomadeps",
|
| "--build-data-dir",
|
| "[ROOT]/build_data_dir",
|
| "--compiler",
|
| @@ -360,9 +360,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/tools/determinism/remove_build_metadata.py",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/tools/determinism/remove_build_metadata.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/out/Release"
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/out/Release"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "remove_build_metadata"
|
| @@ -372,14 +372,14 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/isolate.py",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/tools/swarming_client",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/tools/swarming_client",
|
| "batcharchive",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/out/Release/browser_tests.isolated.gen.json"
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/out/Release/browser_tests.isolated.gen.json"
|
| ],
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| @@ -395,11 +395,11 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/out/Release",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/out/Release",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/WebKit_Linux___WPTServe",
|
| + "cwd": "[BUILDER_CACHE]/WebKit_Linux___RandomOrder",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -420,7 +420,7 @@
|
| "\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
|
| "browser_tests"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/WebKit_Linux___WPTServe",
|
| + "cwd": "[BUILDER_CACHE]/WebKit_Linux___RandomOrder",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -442,11 +442,11 @@
|
| "Release",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"WebKit Linux - WPTServe\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"WebKit Linux - RandomOrder\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"WebKit Linux - WPTServe\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"WebKit Linux - RandomOrder\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--step-name=webkit_tests",
|
| - "--builder-name=WebKit Linux - WPTServe",
|
| + "--builder-name=WebKit Linux - RandomOrder",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| @@ -456,7 +456,7 @@
|
| "-o",
|
| "[SLAVE_BUILD]/layout-test-results",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/out",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/out",
|
| "--json-test-results",
|
| "/path/to/tmp/json",
|
| "--test-results-server",
|
| @@ -464,12 +464,12 @@
|
| "--build-number",
|
| "571",
|
| "--builder-name",
|
| - "WebKit Linux - WPTServe",
|
| + "WebKit Linux - RandomOrder",
|
| "--step-name",
|
| "webkit_tests",
|
| - "--enable-wptserve"
|
| + "--order=random"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/WebKit_Linux___WPTServe",
|
| + "cwd": "[BUILDER_CACHE]/WebKit_Linux___RandomOrder",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -486,24 +486,24 @@
|
| "--results-dir",
|
| "[SLAVE_BUILD]/layout-test-results",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/WebKit_Linux___WPTServe/src/out",
|
| + "[BUILDER_CACHE]/WebKit_Linux___RandomOrder/src/out",
|
| "--build-number",
|
| "571",
|
| "--builder-name",
|
| - "WebKit Linux - WPTServe",
|
| + "WebKit Linux - RandomOrder",
|
| "--gs-bucket",
|
| "gs://chromium-layout-test-archives",
|
| "--staging-dir",
|
| "[CACHE]/chrome_staging"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/WebKit_Linux___WPTServe",
|
| + "cwd": "[BUILDER_CACHE]/WebKit_Linux___RandomOrder",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| "name": "archive_webkit_tests_results",
|
| "~followup_annotations": [
|
| - "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/WebKit_Linux_-_WPTServe/571/layout-test-results/results.html@@@",
|
| - "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/WebKit_Linux_-_WPTServe/571/layout-test-results.zip@@@"
|
| + "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/WebKit_Linux_-_RandomOrder/571/layout-test-results/results.html@@@",
|
| + "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/WebKit_Linux_-_RandomOrder/571/layout-test-results.zip@@@"
|
| ]
|
| },
|
| {
|
| @@ -513,7 +513,7 @@
|
| "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
|
| "browser_tests"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/WebKit_Linux___WPTServe",
|
| + "cwd": "[BUILDER_CACHE]/WebKit_Linux___RandomOrder",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
|
|