| Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Mac_Test_Retina_Perf.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Mac_Retina_Power_Perf.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Mac_Test_Retina_Perf.json
|
| similarity index 82%
|
| rename from scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Mac_Retina_Power_Perf.json
|
| rename to scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Mac_Test_Retina_Perf.json
|
| index adc6b37620291f26ac624d6aef849ce4c76f87da..e1947ccd647f261d6f42a59c7aadb8a7a0d02e80 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Mac_Retina_Power_Perf.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Mac_Test_Retina_Perf.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]/Mac_Retina_Power_Perf",
|
| + "[BUILDER_CACHE]/Mac_Test_Retina_Perf",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -29,7 +29,7 @@
|
| "--master",
|
| "chromium.perf.fyi",
|
| "--builder",
|
| - "Mac Retina Power Perf",
|
| + "Mac Test Retina Perf",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -47,7 +47,7 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Mac_Retina_Power_Perf",
|
| + "cwd": "[BUILDER_CACHE]/Mac_Test_Retina_Perf",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -188,7 +188,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Mac_Retina_Power_Perf/src",
|
| + "cwd": "[BUILDER_CACHE]/Mac_Test_Retina_Perf/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_DEFINES": "branding=Chrome buildtype=Official clang=1 component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
|
| @@ -212,7 +212,7 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[BUILDER_CACHE]/Mac_Retina_Power_Perf/src/out/Release"
|
| + "[BUILDER_CACHE]/Mac_Test_Retina_Perf/src/out/Release"
|
| ],
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| @@ -239,7 +239,7 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Mac_Retina_Power_Perf/src",
|
| + "[BUILDER_CACHE]/Mac_Test_Retina_Perf/src",
|
| "--build-archive-url",
|
| "gs://test-domain/test-archive.zip",
|
| "--master-name",
|
| @@ -253,7 +253,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Mac_Retina_Power_Perf/src/tools/perf/run_benchmark",
|
| + "[BUILDER_CACHE]/Mac_Test_Retina_Perf/src/tools/perf/run_benchmark",
|
| "list",
|
| "--browser",
|
| "release",
|
| @@ -262,7 +262,7 @@
|
| "--num-shards",
|
| "1"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Mac_Retina_Power_Perf",
|
| + "cwd": "[BUILDER_CACHE]/Mac_Test_Retina_Perf",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -309,9 +309,9 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Mac Retina Power Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Test Retina Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Retina Power Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Test Retina Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--annotate=graphing",
|
| "--results-url=https://chromeperf.appspot.com",
|
| "--perf-dashboard-id=blink_perf.all",
|
| @@ -320,7 +320,7 @@
|
| "--step-name=blink_perf.all.exact",
|
| "--chartjson-file",
|
| "/path/to/tmp/json",
|
| - "--builder-name=Mac Retina Power Perf",
|
| + "--builder-name=Mac Test Retina Perf",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| @@ -329,7 +329,7 @@
|
| "-v",
|
| "--b=2"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Mac_Retina_Power_Perf",
|
| + "cwd": "[BUILDER_CACHE]/Mac_Test_Retina_Perf",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -348,9 +348,9 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Mac Retina Power Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Test Retina Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Retina Power Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Test Retina Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--annotate=graphing",
|
| "--results-url=https://chromeperf.appspot.com",
|
| "--perf-dashboard-id=blink_perf.all",
|
| @@ -359,7 +359,7 @@
|
| "--step-name=blink_perf.all.release",
|
| "--chartjson-file",
|
| "/path/to/tmp/json",
|
| - "--builder-name=Mac Retina Power Perf",
|
| + "--builder-name=Mac Test Retina Perf",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| @@ -368,7 +368,7 @@
|
| "-v",
|
| "--b=2"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Mac_Retina_Power_Perf",
|
| + "cwd": "[BUILDER_CACHE]/Mac_Test_Retina_Perf",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -387,9 +387,9 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Mac Retina Power Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Test Retina Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Retina Power Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Test Retina Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--annotate=graphing",
|
| "--results-url=https://chromeperf.appspot.com",
|
| "--perf-dashboard-id=blink_perf.dom",
|
| @@ -398,7 +398,7 @@
|
| "--step-name=blink_perf.dom",
|
| "--chartjson-file",
|
| "/path/to/tmp/json",
|
| - "--builder-name=Mac Retina Power Perf",
|
| + "--builder-name=Mac Test Retina Perf",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| @@ -406,7 +406,7 @@
|
| "--upload-results",
|
| "blink_perf.dom"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Mac_Retina_Power_Perf",
|
| + "cwd": "[BUILDER_CACHE]/Mac_Test_Retina_Perf",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -425,9 +425,9 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Mac Retina Power Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Test Retina Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Retina Power Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Test Retina Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--annotate=graphing",
|
| "--results-url=https://chromeperf.appspot.com",
|
| "--perf-dashboard-id=dromaeo.cssqueryjquery",
|
| @@ -436,13 +436,13 @@
|
| "--step-name=dromaeo.cssqueryjquery",
|
| "--chartjson-file",
|
| "/path/to/tmp/json",
|
| - "--builder-name=Mac Retina Power Perf",
|
| + "--builder-name=Mac Test Retina Perf",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| "/path/to/run_benchmark"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Mac_Retina_Power_Perf",
|
| + "cwd": "[BUILDER_CACHE]/Mac_Test_Retina_Perf",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -461,9 +461,9 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Mac Retina Power Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Test Retina Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Retina Power Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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\": \"Mac Test Retina Perf\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--annotate=graphing",
|
| "--results-url=https://chromeperf.appspot.com",
|
| "--perf-dashboard-id=dromaeo.cssqueryjquery",
|
| @@ -472,13 +472,13 @@
|
| "--step-name=dromaeo.cssqueryjquery.release",
|
| "--chartjson-file",
|
| "/path/to/tmp/json",
|
| - "--builder-name=Mac Retina Power Perf",
|
| + "--builder-name=Mac Test Retina Perf",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| "/path/to/run_benchmark"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Mac_Retina_Power_Perf",
|
| + "cwd": "[BUILDER_CACHE]/Mac_Test_Retina_Perf",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
|
|