0

Switch Skia Gold tests to use mixin

Switches all tests that use Skia Gold to use a mixin instead of
individually specifying arguments in each test definition. As a
prerequisite, also ensures that all test types that use Skia Gold use
the same naming for Gold-related arguments.

This is requisite work for adding a universal Gold kill switch in the
unlikely event of an outage that can't be fixed quickly, as the switch
can just be added to the mixin.

Bug: 1057848
Change-Id: Ib57480f374eab088ac3a389637bfbff1ee41e8b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2121419
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Sven Zheng <svenzheng@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755521}
This commit is contained in:
Brian Sheedy
2020-04-01 20:47:32 +00:00
committed by Commit Bot
parent 0f82c522da
commit 4d335debdd
16 changed files with 1437 additions and 1506 deletions

@ -42,7 +42,7 @@ class BrowserSkiaGoldPixelDiffTest : public views::test::WidgetTest {
public:
BrowserSkiaGoldPixelDiffTest() {
auto* cmd_line = base::CommandLine::ForCurrentProcess();
cmd_line->AppendSwitchASCII("build-revision", "test");
cmd_line->AppendSwitchASCII("git-revision", "test");
}
private:

@ -77,7 +77,7 @@ class SkiaGoldIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
_skia_gold_temp_dir = None
_local_run = None
_build_revision = None
_git_revision = None
@classmethod
def SetParsedCommandLineOptions(cls, options):
@ -123,7 +123,7 @@ class SkiaGoldIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
def AddCommandlineArgs(cls, parser):
super(SkiaGoldIntegrationTestBase, cls).AddCommandlineArgs(parser)
parser.add_option(
'--build-revision',
'--git-revision',
help='Chrome revision being tested.',
default=None)
parser.add_option(
@ -140,15 +140,15 @@ class SkiaGoldIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
'profile after the test completes; leave the system using the sRGB color '
'profile. See http://crbug.com/784456.')
parser.add_option(
'--review-patch-issue',
'--gerrit-issue',
help='For Skia Gold integration. Gerrit issue ID.',
default='')
parser.add_option(
'--review-patch-set',
'--gerrit-patchset',
help='For Skia Gold integration. Gerrit patch set number.',
default='')
parser.add_option(
'--buildbucket-build-id',
'--buildbucket-id',
help='For Skia Gold integration. Buildbucket build ID.',
default='')
parser.add_option(
@ -335,16 +335,15 @@ class SkiaGoldIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
'--commit',
self._GetBuildRevision(),
]
# If --review-patch-issue is passed, then we assume we're running on a
# trybot.
if parsed_options.review_patch_issue:
# If --gerrit-issue is passed, then we assume we're running on a trybot.
if parsed_options.gerrit_issue:
build_id_args += [
'--issue',
parsed_options.review_patch_issue,
parsed_options.gerrit_issue,
'--patchset',
parsed_options.review_patch_set,
parsed_options.gerrit_patchset,
'--jobid',
parsed_options.buildbucket_build_id,
parsed_options.buildbucket_id,
'--crs',
'gerrit',
'--cis',
@ -439,10 +438,10 @@ class SkiaGoldIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
# If we're running on a trybot, instead generate a link to all results
# for the CL so that the user can visit a single page instead of
# clicking on multiple links on potentially multiple bots.
elif parsed_options.review_patch_issue:
elif parsed_options.gerrit_issue:
cl_images = ('https://%s-gold.skia.org/search?'
'issue=%s&new_clstore=true' % (
SKIA_GOLD_INSTANCE, parsed_options.review_patch_issue))
SKIA_GOLD_INSTANCE, parsed_options.gerrit_issue))
self.artifacts.CreateLink('triage_link_for_entire_cl', cl_images)
else:
try:
@ -503,7 +502,7 @@ class SkiaGoldIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
# grace period. However, fail if we're on a trybot so that as many images
# can be triaged as possible before a new test is committed.
if (page.grace_period_end and date.today() <= page.grace_period_end and
not parsed_options.review_patch_issue):
not parsed_options.gerrit_issue):
return False
return True
@ -570,25 +569,25 @@ class SkiaGoldIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
@classmethod
def _GetBuildRevision(cls):
"""Returns the current git master revision being tested."""
# Do nothing if we've already determined the build revision.
if cls._build_revision is not None:
# Do nothing if we've already determined the git revision.
if cls._git_revision is not None:
pass
# use the --build-revision value if it's been set.
elif cls.GetParsedCommandLineOptions().build_revision:
cls._build_revision = cls.GetParsedCommandLineOptions().build_revision
# use the --git-revision value if it's been set.
elif cls.GetParsedCommandLineOptions().git_revision:
cls._git_revision = cls.GetParsedCommandLineOptions().git_revision
# Try to determine what revision we're on using git.
else:
try:
cls._build_revision = subprocess.check_output(
cls._git_revision = subprocess.check_output(
['git', 'rev-parse', 'origin/master'],
shell=IsWin(),
cwd=path_util.GetChromiumSrcDir()).strip()
logging.warning('Automatically determined build revision to be %s',
cls._build_revision)
logging.warning('Automatically determined git revision to be %s',
cls._git_revision)
except subprocess.CalledProcessError:
raise Exception('--build-revision not passed, and unable to '
raise Exception('--git-revision not passed, and unable to '
'determine revision using git')
return cls._build_revision
return cls._git_revision
@classmethod
def GenerateGpuTests(cls, options):

@ -296,12 +296,12 @@ Example usage:
--passthrough`
If, for some reason, the local run code is unable to determine what the git
revision is, simply pass '--build-revision aabbccdd'. Note that `aabbccdd` must
revision is, simply pass `--git-revision aabbccdd`. Note that `aabbccdd` must
be replaced with an actual Chromium src revision (typically whatever revision
origin/master is currently synced to) in order for the tests to work. This can
be done automatically using:
``run_gpu_integration_test.py pixel --no-skia-gold-failure --local-run
--passthrough --build-revision `git rev-parse origin/master` ``
--passthrough --git-revision `git rev-parse origin/master` ``
## Running Binaries from the Bots Locally

@ -21229,10 +21229,10 @@
"--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_ddview_skipdon_setupcomplete.json",
"--replace-system-package=com.google.vr.vrcore,//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk",
"--additional-apk=//third_party/gvr-android-sdk/test-apks/vr_keyboard/vr_keyboard_current.apk",
"--git-revision",
"${got_revision}",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
"--recover-devices",
"--git-revision",
"${got_revision}"
],
"merge": {
"args": [
@ -21621,10 +21621,10 @@
"--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_ddview_skipdon_setupcomplete.json",
"--replace-system-package=com.google.vr.vrcore,//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk",
"--additional-apk=//third_party/gvr-android-sdk/test-apks/vr_keyboard/vr_keyboard_current.apk",
"--git-revision",
"${got_revision}",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
"--recover-devices",
"--git-revision",
"${got_revision}"
],
"merge": {
"args": [
@ -37207,10 +37207,10 @@
"--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_ddview_skipdon_setupcomplete.json",
"--replace-system-package=com.google.vr.vrcore,//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk",
"--additional-apk=//third_party/gvr-android-sdk/test-apks/vr_keyboard/vr_keyboard_current.apk",
"--git-revision",
"${got_revision}",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
"--recover-devices",
"--git-revision",
"${got_revision}"
],
"merge": {
"args": [

File diff suppressed because it is too large Load Diff

@ -42163,11 +42163,12 @@
"gtest_tests": [
{
"args": [
"--build-revision=${got_revision}",
"--test-launcher-filter-file=../../testing/buildbot/filters/pixel_browser_tests.filter",
"--browser-ui-tests-verify-pixels",
"--test-launcher-retry-limit=0",
"--enable-pixel-output-in-tests"
"--enable-pixel-output-in-tests",
"--git-revision",
"${got_revision}"
],
"experiment_percentage": 100,
"merge": {
@ -42176,9 +42177,12 @@
},
"name": "pixel_browser_tests",
"precommit_args": [
"--issue=${patch_issue}",
"--patchset=${patch_set}",
"--jobid=${buildbucket_build_id}"
"--gerrit-issue",
"${patch_issue}",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"swarming": {
"can_use_on_swarming_builders": true,

File diff suppressed because it is too large Load Diff

@ -171,10 +171,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -183,11 +183,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -215,10 +215,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -227,11 +227,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -652,10 +652,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -664,11 +664,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -695,10 +695,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -707,11 +707,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1095,10 +1095,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1107,11 +1107,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1138,10 +1138,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1150,11 +1150,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1497,10 +1497,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1509,11 +1509,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1539,10 +1539,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1551,11 +1551,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1920,10 +1920,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1932,11 +1932,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1962,10 +1962,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1974,11 +1974,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -2376,10 +2376,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_coverage_data": true,
"isolate_name": "telemetry_gpu_integration_test",
@ -2389,11 +2389,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -2419,10 +2419,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_coverage_data": true,
"isolate_name": "telemetry_gpu_integration_test",
@ -2432,11 +2432,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -2819,10 +2819,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -2831,11 +2831,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -2863,10 +2863,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -2875,11 +2875,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -3270,10 +3270,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -3282,11 +3282,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -3314,10 +3314,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -3326,11 +3326,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -3756,10 +3756,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_coverage_data": true,
"isolate_name": "telemetry_gpu_integration_test",
@ -3769,11 +3769,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -3801,10 +3801,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_coverage_data": true,
"isolate_name": "telemetry_gpu_integration_test",
@ -3814,11 +3814,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -4285,10 +4285,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -4297,11 +4297,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -4328,10 +4328,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -4340,11 +4340,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -4876,10 +4876,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -4888,11 +4888,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -4928,10 +4928,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -4940,11 +4940,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -5559,10 +5559,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_coverage_data": true,
"isolate_name": "telemetry_gpu_integration_test",
@ -5572,11 +5572,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -5612,10 +5612,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_revision}"
],
"isolate_coverage_data": true,
"isolate_name": "telemetry_gpu_integration_test",
@ -5625,11 +5625,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,

@ -1739,11 +1739,12 @@
},
{
"args": [
"--build-revision=${got_revision}",
"--test-launcher-filter-file=../../testing/buildbot/filters/pixel_browser_tests.filter",
"--browser-ui-tests-verify-pixels",
"--test-launcher-retry-limit=0",
"--enable-pixel-output-in-tests"
"--enable-pixel-output-in-tests",
"--git-revision",
"${got_revision}"
],
"experiment_percentage": 100,
"merge": {
@ -1752,9 +1753,12 @@
},
"name": "pixel_browser_tests",
"precommit_args": [
"--issue=${patch_issue}",
"--patchset=${patch_set}",
"--jobid=${buildbucket_build_id}"
"--gerrit-issue",
"${patch_issue}",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"swarming": {
"can_use_on_swarming_builders": true,

@ -132,10 +132,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -144,11 +144,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -175,10 +175,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -187,11 +187,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -463,10 +463,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -475,11 +475,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -505,10 +505,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -517,11 +517,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -789,10 +789,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -801,11 +801,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -831,10 +831,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -843,11 +843,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1111,10 +1111,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1123,11 +1123,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1152,10 +1152,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1164,11 +1164,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1779,10 +1779,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1791,11 +1791,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1821,10 +1821,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1833,11 +1833,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,

@ -630,6 +630,18 @@
},
},
},
'skia_gold_test': {
'$mixin_append': {
'args': [
'--git-revision', '${got_revision}',
],
'precommit_args': [
'--gerrit-issue', '${patch_issue}',
'--gerrit-patchset', '${patch_set}',
'--buildbucket-id', '${buildbucket_build_id}',
],
}
},
'swarming_containment_auto': {
'swarming': {
'containment_type': 'AUTO',

@ -1280,27 +1280,27 @@
# use ${got_cr_revision}, which is only set on the V8 bots.
'Android V8 FYI Release (Nexus 5X)': {
'args': {
'--build-revision': '${got_cr_revision}',
'--git-revision': '${got_cr_revision}',
},
},
'Linux V8 FYI Release (NVIDIA)': {
'args': {
'--build-revision': '${got_cr_revision}',
'--git-revision': '${got_cr_revision}',
},
},
'Linux V8 FYI Release - pointer compression (NVIDIA)': {
'args': {
'--build-revision': '${got_cr_revision}',
'--git-revision': '${got_cr_revision}',
},
},
'Mac V8 FYI Release (Intel)': {
'args': {
'--build-revision': '${got_cr_revision}',
'--git-revision': '${got_cr_revision}',
},
},
'Win V8 FYI Release (NVIDIA)': {
'args': {
'--build-revision': '${got_cr_revision}',
'--git-revision': '${got_cr_revision}',
},
},
},
@ -1876,27 +1876,27 @@
# use ${got_cr_revision}, which is only set on the V8 bots.
'Android V8 FYI Release (Nexus 5X)': {
'args': {
'--build-revision': '${got_cr_revision}',
'--git-revision': '${got_cr_revision}',
},
},
'Linux V8 FYI Release (NVIDIA)': {
'args': {
'--build-revision': '${got_cr_revision}',
'--git-revision': '${got_cr_revision}',
},
},
'Linux V8 FYI Release - pointer compression (NVIDIA)': {
'args': {
'--build-revision': '${got_cr_revision}',
'--git-revision': '${got_cr_revision}',
},
},
'Mac V8 FYI Release (Intel)': {
'args': {
'--build-revision': '${got_cr_revision}',
'--git-revision': '${got_cr_revision}',
},
},
'Win V8 FYI Release (NVIDIA)': {
'args': {
'--build-revision': '${got_cr_revision}',
'--git-revision': '${got_cr_revision}',
},
},
},

@ -40,14 +40,11 @@
'--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_ddview_skipdon_setupcomplete.json',
'--replace-system-package=com.google.vr.vrcore,//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk',
'--additional-apk=//third_party/gvr-android-sdk/test-apks/vr_keyboard/vr_keyboard_current.apk',
'--git-revision', '${got_revision}',
],
'precommit_args': [
'--gerrit-issue', '${patch_issue}',
'--gerrit-patchset', '${patch_set}',
'--buildbucket-id', '${buildbucket_build_id}',
'mixins': [
'chrome-gold-service-account',
'skia_gold_test',
],
'mixins': ['chrome-gold-service-account'],
'swarming': {
'shards': 4,
},
@ -193,23 +190,13 @@
'name': 'android_webview_pixel_skia_gold_test',
'args': [
'--dont-restore-color-profile-after-test',
'--build-revision',
'${got_revision}',
'--test-machine-name',
'${buildername}',
],
'precommit_args': [
# Gerrit issue ID
'--review-patch-issue',
'${patch_issue}',
# Patch set number
'--review-patch-set',
'${patch_set}',
# Buildbucket ID
'--buildbucket-build-id',
'${buildbucket_build_id}',
'mixins': [
'chrome-gpu-gold-service-account',
'skia_gold_test',
],
'mixins': ['chrome-gpu-gold-service-account'],
'telemetry_test_name': 'pixel',
},
},
@ -2193,47 +2180,27 @@
'name': 'gl_renderer_maps_pixel_tests',
'args': [
'--dont-restore-color-profile-after-test',
'--build-revision',
'${got_revision}',
'--test-machine-name',
'${buildername}',
'--extra-browser-args=--disable-features=UseSkiaRenderer',
],
'precommit_args': [
# Gerrit issue ID
'--review-patch-issue',
'${patch_issue}',
# Patch set number
'--review-patch-set',
'${patch_set}',
# Buildbucket ID
'--buildbucket-build-id',
'${buildbucket_build_id}',
'mixins': [
'chrome-gpu-gold-service-account',
'skia_gold_test',
],
'mixins': ['chrome-gpu-gold-service-account'],
},
'pixel': {
'name': 'gl_renderer_pixel_skia_gold_tests',
'args': [
'--dont-restore-color-profile-after-test',
'--build-revision',
'${got_revision}',
'--test-machine-name',
'${buildername}',
'--extra-browser-args=--disable-features=UseSkiaRenderer',
],
'precommit_args': [
# Gerrit issue ID
'--review-patch-issue',
'${patch_issue}',
# Patch set number
'--review-patch-set',
'${patch_set}',
# Buildbucket ID
'--buildbucket-build-id',
'${buildbucket_build_id}',
'mixins': [
'chrome-gpu-gold-service-account',
'skia_gold_test',
],
'mixins': ['chrome-gpu-gold-service-account'],
},
'screenshot_sync': {
'name': 'gl_renderer_screenshot_sync_tests',
@ -2316,24 +2283,14 @@
'name': 'egl_pixel_skia_gold_test',
'args': [
'--dont-restore-color-profile-after-test',
'--build-revision',
'${got_revision}',
'--test-machine-name',
'${buildername}',
'--extra-browser-args=--enable-features=UseSkiaRenderer --use-gl=egl --enable-gpu-rasterization --force-gpu-rasterization --enable-oop-rasterization --disable-software-compositing-fallback --disable-headless-mode',
],
'precommit_args': [
# Gerrit issue ID
'--review-patch-issue',
'${patch_issue}',
# Patch set number
'--review-patch-set',
'${patch_set}',
# Buildbucket ID
'--buildbucket-build-id',
'${buildbucket_build_id}',
'mixins': [
'chrome-gpu-gold-service-account',
'skia_gold_test',
],
'mixins': ['chrome-gpu-gold-service-account'],
'telemetry_test_name': 'pixel',
},
},
@ -2364,24 +2321,14 @@
'name': 'maps_pixel_test',
'args': [
'--dont-restore-color-profile-after-test',
'--build-revision',
'${got_revision}',
'--test-machine-name',
'${buildername}',
'--extra-browser-args=--enable-features=UseSkiaRenderer',
],
'precommit_args': [
# Gerrit issue ID
'--review-patch-issue',
'${patch_issue}',
# Patch set number
'--review-patch-set',
'${patch_set}',
# Buildbucket ID
'--buildbucket-build-id',
'${buildbucket_build_id}',
'mixins': [
'chrome-gpu-gold-service-account',
'skia_gold_test',
],
'mixins': ['chrome-gpu-gold-service-account'],
},
'screenshot_sync': {
'args': [
@ -2393,24 +2340,14 @@
'name': 'skia_renderer_pixel_skia_gold_test',
'args': [
'--dont-restore-color-profile-after-test',
'--build-revision',
'${got_revision}',
'--test-machine-name',
'${buildername}',
'--extra-browser-args=--enable-features=UseSkiaRenderer',
],
'precommit_args': [
# Gerrit issue ID
'--review-patch-issue',
'${patch_issue}',
# Patch set number
'--review-patch-set',
'${patch_set}',
# Buildbucket ID
'--buildbucket-build-id',
'${buildbucket_build_id}',
'mixins': [
'chrome-gpu-gold-service-account',
'skia_gold_test',
],
'mixins': ['chrome-gpu-gold-service-account'],
'telemetry_test_name': 'pixel',
},
},
@ -2438,24 +2375,14 @@
'name': 'vulkan_pixel_skia_gold_test',
'args': [
'--dont-restore-color-profile-after-test',
'--build-revision',
'${got_revision}',
'--test-machine-name',
'${buildername}',
'--extra-browser-args=--use-vulkan=native --disable-vulkan-fallback-to-gl-for-testing --enable-features=UseSkiaRenderer,Vulkan --use-cmd-decoder=validating',
],
'precommit_args': [
# Gerrit issue ID
'--review-patch-issue',
'${patch_issue}',
# Patch set number
'--review-patch-set',
'${patch_set}',
# Buildbucket ID
'--buildbucket-build-id',
'${buildbucket_build_id}',
'mixins': [
'chrome-gpu-gold-service-account',
'skia_gold_test',
],
'mixins': ['chrome-gpu-gold-service-account'],
'telemetry_test_name': 'pixel',
},
},
@ -2476,45 +2403,25 @@
'name': 'maps_pixel_test',
'args': [
'--dont-restore-color-profile-after-test',
'--build-revision',
'${got_revision}',
'--test-machine-name',
'${buildername}',
],
'precommit_args': [
# Gerrit issue ID
'--review-patch-issue',
'${patch_issue}',
# Patch set number
'--review-patch-set',
'${patch_set}',
# Buildbucket ID
'--buildbucket-build-id',
'${buildbucket_build_id}',
'mixins': [
'chrome-gpu-gold-service-account',
'skia_gold_test',
],
'mixins': ['chrome-gpu-gold-service-account'],
},
'pixel_skia': {
'name': 'pixel_skia_gold_test',
'args': [
'--dont-restore-color-profile-after-test',
'--build-revision',
'${got_revision}',
'--test-machine-name',
'${buildername}',
],
'precommit_args': [
# Gerrit issue ID
'--review-patch-issue',
'${patch_issue}',
# Patch set number
'--review-patch-set',
'${patch_set}',
# Buildbucket ID
'--buildbucket-build-id',
'${buildbucket_build_id}',
'mixins': [
'chrome-gpu-gold-service-account',
'skia_gold_test',
],
'mixins': ['chrome-gpu-gold-service-account'],
'telemetry_test_name': 'pixel',
},
'screenshot_sync': {
@ -3259,7 +3166,6 @@
'pixel_browser_tests': {
'name': 'pixel_browser_tests',
'args': [
'--build-revision=${got_revision}',
'--test-launcher-filter-file=../../testing/buildbot/filters/pixel_browser_tests.filter',
'--browser-ui-tests-verify-pixels',
# Do not allow retry or it will break the bulk approval process.
@ -3269,14 +3175,12 @@
'--test-launcher-retry-limit=0',
'--enable-pixel-output-in-tests',
],
'precommit_args': [
'--issue=${patch_issue}',
'--patchset=${patch_set}',
'--jobid=${buildbucket_build_id}',
],
'experiment_percentage': 100,
'test': 'browser_tests',
'mixins': ['chrome-gold-service-account'],
'mixins': [
'chrome-gold-service-account',
'skia_gold_test',
],
},
},

@ -132,10 +132,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -144,11 +144,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -175,10 +175,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -187,11 +187,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1609,10 +1609,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1621,11 +1621,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1651,10 +1651,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1663,11 +1663,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1935,10 +1935,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1947,11 +1947,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -1977,10 +1977,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -1989,11 +1989,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -2257,10 +2257,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -2269,11 +2269,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -2298,10 +2298,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -2310,11 +2310,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -2925,10 +2925,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -2937,11 +2937,11 @@
},
"name": "maps_pixel_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,
@ -2967,10 +2967,10 @@
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--dont-restore-color-profile-after-test",
"--build-revision",
"${got_cr_revision}",
"--test-machine-name",
"${buildername}"
"${buildername}",
"--git-revision",
"${got_cr_revision}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
@ -2979,11 +2979,11 @@
},
"name": "pixel_skia_gold_test",
"precommit_args": [
"--review-patch-issue",
"--gerrit-issue",
"${patch_issue}",
"--review-patch-set",
"--gerrit-patchset",
"${patch_set}",
"--buildbucket-build-id",
"--buildbucket-id",
"${buildbucket_build_id}"
],
"should_retry_with_patch": false,

@ -37,12 +37,12 @@ const char* kSkiaGoldCtl = "tools/skia_goldctl/mac/goldctl";
const char* kSkiaGoldCtl = "tools/skia_goldctl/linux/goldctl";
#endif
const char* kBuildRevisionKey = "build-revision";
const char* kBuildRevisionKey = "git-revision";
// The switch keys for tryjob.
const char* kIssueKey = "issue";
const char* kPatchSetKey = "patchset";
const char* kJobIdKey = "jobid";
const char* kIssueKey = "gerrit-issue";
const char* kPatchSetKey = "gerrit-patchset";
const char* kJobIdKey = "buildbucket-id";
const char* kNoLuciAuth = "no-luci-auth";
const char* kBypassSkiaGoldFunctionality = "bypass-skia-gold-functionality";

@ -29,7 +29,7 @@ class SkiaGoldPixelDiffTest : public ::testing::Test {
public:
SkiaGoldPixelDiffTest() {
auto* cmd_line = base::CommandLine::ForCurrentProcess();
cmd_line->AppendSwitchASCII("build-revision", "test");
cmd_line->AppendSwitchASCII("git-revision", "test");
}
~SkiaGoldPixelDiffTest() override {}