| Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Mac_Retina_Power_Perf.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Mac_HDD_Perf__2_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Mac_Retina_Power_Perf.json
|
| similarity index 74%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_perf_Mac_HDD_Perf__2_.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Mac_Retina_Power_Perf.json
|
| index f641f64590c2cd1993864debc5375a8c15b09374..faa85e75aa2c9ed2eb597c072c0828b67347e837 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Mac_HDD_Perf__2_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Mac_Retina_Power_Perf.json
|
| @@ -5,9 +5,9 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| - "chromium.perf",
|
| + "chromium.perf.fyi",
|
| "--builder",
|
| - "Mac HDD Perf (2)",
|
| + "Mac Retina Power Perf",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -177,42 +177,6 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| - "--output",
|
| - "/path/to/tmp/json",
|
| - "--",
|
| - "--build-config-fs",
|
| - "Release",
|
| - "--paths",
|
| - "{\"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\": \"Mac HDD Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"chromium-rel-mac-hdd\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}"
|
| - ],
|
| - "name": "get compile targets for scripts",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "name": "read test spec",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| "--show-path",
|
| "python",
|
| @@ -252,7 +216,7 @@
|
| "--build-archive-url",
|
| "gs://test-domain/test-archive.zip",
|
| "--master-name",
|
| - "chromium.perf",
|
| + "chromium.perf.fyi",
|
| "--build-number",
|
| "571"
|
| ],
|
| @@ -269,7 +233,7 @@
|
| "--json-output",
|
| "/path/to/tmp/json",
|
| "--num-shards",
|
| - "5"
|
| + "1"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| @@ -280,7 +244,7 @@
|
| "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",
|
| @@ -290,16 +254,16 @@
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 3@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| @@ -317,18 +281,18 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Mac HDD Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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 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\", \"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 HDD Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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 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\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--annotate=graphing",
|
| "--results-url=https://chromeperf.appspot.com",
|
| "--perf-dashboard-id=blink_perf.all",
|
| - "--perf-id=chromium-rel-mac-hdd",
|
| + "--perf-id=mac-retina-fyi",
|
| "--test-type=blink_perf.all",
|
| "--step-name=blink_perf.all.exact",
|
| "--chartjson-file",
|
| "/path/to/tmp/json",
|
| - "--builder-name=Mac HDD Perf (2)",
|
| + "--builder-name=Mac Retina Power Perf",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| @@ -355,18 +319,56 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Mac HDD Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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 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\", \"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 HDD Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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 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\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--annotate=graphing",
|
| + "--results-url=https://chromeperf.appspot.com",
|
| + "--perf-dashboard-id=blink_perf.all",
|
| + "--perf-id=mac-retina-fyi",
|
| + "--test-type=blink_perf.all",
|
| + "--step-name=blink_perf.all.release",
|
| + "--chartjson-file",
|
| + "/path/to/tmp/json",
|
| + "--builder-name=Mac Retina Power Perf",
|
| + "--slave-name=TestSlavename",
|
| + "--build-number=571",
|
| + "--run-python-script",
|
| + "/path/to/run_benchmark",
|
| + "--a=1",
|
| + "-v",
|
| + "--b=2"
|
| + ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| + "name": "blink_perf.all.release",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@[]@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| + },
|
| + {
|
| + "allow_subannotations": true,
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
|
| + "--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\", \"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\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--annotate=graphing",
|
| "--results-url=https://chromeperf.appspot.com",
|
| "--perf-dashboard-id=blink_perf.dom",
|
| - "--perf-id=chromium-rel-mac-hdd",
|
| + "--perf-id=mac-retina-fyi",
|
| "--test-type=blink_perf.dom",
|
| "--step-name=blink_perf.dom",
|
| "--chartjson-file",
|
| "/path/to/tmp/json",
|
| - "--builder-name=Mac HDD Perf (2)",
|
| + "--builder-name=Mac Retina Power Perf",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| @@ -392,18 +394,53 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Mac HDD Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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 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\", \"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\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--annotate=graphing",
|
| + "--results-url=https://chromeperf.appspot.com",
|
| + "--perf-dashboard-id=dromaeo.cssqueryjquery",
|
| + "--perf-id=mac-retina-fyi",
|
| + "--test-type=dromaeo.cssqueryjquery",
|
| + "--step-name=dromaeo.cssqueryjquery",
|
| + "--chartjson-file",
|
| + "/path/to/tmp/json",
|
| + "--builder-name=Mac Retina Power Perf",
|
| + "--slave-name=TestSlavename",
|
| + "--build-number=571",
|
| + "--run-python-script",
|
| + "/path/to/run_benchmark"
|
| + ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| + "name": "dromaeo.cssqueryjquery",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@[]@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| + },
|
| + {
|
| + "allow_subannotations": true,
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
|
| + "--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\", \"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 HDD Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"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 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\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--annotate=graphing",
|
| "--results-url=https://chromeperf.appspot.com",
|
| "--perf-dashboard-id=dromaeo.cssqueryjquery",
|
| - "--perf-id=chromium-rel-mac-hdd",
|
| + "--perf-id=mac-retina-fyi",
|
| "--test-type=dromaeo.cssqueryjquery",
|
| "--step-name=dromaeo.cssqueryjquery.release",
|
| "--chartjson-file",
|
| "/path/to/tmp/json",
|
| - "--builder-name=Mac HDD Perf (2)",
|
| + "--builder-name=Mac Retina Power Perf",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
|
|