[gold] Make the build_system an actual key
Because the build_system could impact the image produced, they should
be distinct traces.
Change-Id: I720e865569d6f7896a73fd48ba99a4a437f0e74b
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/403619
Reviewed-by: Leandro Lovisolo <lovisolo@google.com>
diff --git a/infra/bots/task_drivers/bazel_test_all/bazel_test_all.go b/infra/bots/task_drivers/bazel_test_all/bazel_test_all.go
index cce5232..a6b1eb9 100644
--- a/infra/bots/task_drivers/bazel_test_all/bazel_test_all.go
+++ b/infra/bots/task_drivers/bazel_test_all/bazel_test_all.go
@@ -131,7 +131,8 @@
"--work-dir", goldctlWorkDir,
"--instance", "skia-infra",
"--git_hash", *checkoutFlags.Revision,
- "--key", "source_type:infra",
+ "--corpus", "infra",
+ "--key", "build_system:bazel",
}
if *checkoutFlags.PatchIssue != "" && *checkoutFlags.PatchSet != "" {
extraArgs := []string{
@@ -160,7 +161,6 @@
"--work-dir", goldctlWorkDir,
"--png-file", filepath.Join(puppeteerScreenshotsDir, fileInfo.Name()),
"--test-name", testName,
- "--add-test-optional-key", "build_system:bazel",
}
if err := goldctl(ctx, bzl, args...); err != nil {
return err
diff --git a/puppeteer-tests/upload-screenshots-to-gold.py b/puppeteer-tests/upload-screenshots-to-gold.py
index 3ae1a35..7b973e4 100755
--- a/puppeteer-tests/upload-screenshots-to-gold.py
+++ b/puppeteer-tests/upload-screenshots-to-gold.py
@@ -79,49 +79,43 @@
'DO NOT USE IN PRODUCTION.')
print('')
- # Generate keys file.
- with tempfile.NamedTemporaryFile(mode='w') as keys_file:
- keys_file.write('{"source_type": "infra"}\n') # Corpus.
- keys_file.flush()
-
- # Authorize goldctl.
- with tempfile.TemporaryDirectory() as work_dir: # pylint: disable=no-member
- goldctl(['auth', '--work-dir', work_dir] + ([] if args.local
- else ['--luci']))
-
- # Initialize.
- cmd = [
- 'imgtest', 'init',
- '--work-dir', work_dir,
- '--instance', 'skia-infra',
- '--commit', args.revision,
- '--keys-file', keys_file.name,
+ # Authorize goldctl.
+ with tempfile.TemporaryDirectory() as work_dir: # pylint: disable=no-member
+ goldctl(['auth', '--work-dir', work_dir] + ([] if args.local
+ else ['--luci']))
+ # Initialize.
+ cmd = [
+ 'imgtest', 'init',
+ '--work-dir', work_dir,
+ '--instance', 'skia-infra',
+ '--commit', args.revision,
+ '--corpus', 'infra',
+ '--key', 'build_system:webpack',
+ ]
+ if is_trybot:
+ cmd += [
+ '--crs', 'gerrit',
+ '--cis', 'buildbucket',
+ '--changelist', str(args.issue),
+ '--patchset', str(args.patch_set),
+ '--jobid', args.task_id,
]
- if is_trybot:
- cmd += [
- '--crs', 'gerrit',
- '--cis', 'buildbucket',
- '--changelist', str(args.issue),
- '--patchset', str(args.patch_set),
- '--jobid', args.task_id,
- ]
- goldctl(cmd)
+ goldctl(cmd)
- # Add images.
- for filename in os.listdir(args.images_dir):
- if not filename.lower().endswith('.png'):
- print('Ignoring non-PNG file: ' + filename)
- continue
- goldctl([
- 'imgtest', 'add',
- '--work-dir', work_dir,
- '--png-file', os.path.join(args.images_dir, filename),
- '--test-name', filename[:-4], # Remove .png extension.
- '--add-test-optional-key', 'build_system:webpack',
- ])
+ # Add images.
+ for filename in os.listdir(args.images_dir):
+ if not filename.lower().endswith('.png'):
+ print('Ignoring non-PNG file: ' + filename)
+ continue
+ goldctl([
+ 'imgtest', 'add',
+ '--work-dir', work_dir,
+ '--png-file', os.path.join(args.images_dir, filename),
+ '--test-name', filename[:-4], # Remove .png extension.
+ ])
- # Finalize and clean up.
- goldctl(['imgtest', 'finalize', '--work-dir', work_dir])
+ # Finalize and clean up.
+ goldctl(['imgtest', 'finalize', '--work-dir', work_dir])
if __name__ == '__main__':
