infra: Override Gold mixin.

This mixin is being removed from the Chromium version of the mixins. Therefore we have to move it into the additional mixins option of the generator. Bug: angleproject:6037 Change-Id: I605b7cbf35d6282754bf5fb26246e32b2edcea10 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2939466Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

infra: Override Gold mixin.
2917ab34 · Jamie Madill · Angle LUCI CQ · 0a6c6c00 · 2917ab34 · 2917ab34
Commit 2917ab34 authored Jun 07, 2021 by Jamie Madill Committed by Angle LUCI CQ Jun 08, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 2 deletions

generate_test_spec_json.py infra/specs/generate_test_spec_json.py +19 -1

Test_spec_JSON.json scripts/code_generation_hashes/Test_spec_JSON.json +1 -1

No files found.
--- a/infra/specs/generate_test_spec_json.py
+++ b/infra/specs/generate_test_spec_json.py
@@ -22,7 +22,25 @@ sys.path.insert(0, TESTING_BBOT_DIR)
 import generate_buildbot_json

 # Add custom mixins here.
-ADDITIONAL_MIXINS = {}
+ADDITIONAL_MIXINS = {
+    'angle_skia_gold_test': {
+        '$mixin_append': {
+            'args': [
+                '--git-revision=${got_angle_revision}',
+                # BREAK GLASS IN CASE OF EMERGENCY
+                # Uncommenting this argument will bypass all interactions with Skia
+                # Gold in any tests that use it. This is meant as a temporary
+                # emergency stop in case of a Gold outage that's affecting the bots.
+                # '--bypass-skia-gold-functionality',
+            ],
+            'precommit_args': [
+                '--gerrit-issue=${patch_issue}',
+                '--gerrit-patchset=${patch_set}',
+                '--buildbucket-id=${buildbucket_build_id}',
+            ],
+        }
+    },
+}
 MIXIN_FILE_NAME = os.path.join(THIS_DIR, 'mixins.pyl')
 MIXINS_PYL_TEMPLATE = """\
 # GENERATED FILE - DO NOT EDIT.

--- a/scripts/code_generation_hashes/Test_spec_JSON.json
+++ b/scripts/code_generation_hashes/Test_spec_JSON.json
@@ -2,7 +2,7 @@
  "infra/specs/angle.json":
    "f3e66f10555a523ba51dfbf251c484b3",
  "infra/specs/generate_test_spec_json.py":
-    "e1c8a771f751adad715d7bea900fc8e1",
+    "162566b21bca4ef0b815e411920c9f2d",
  "infra/specs/mixins.pyl":
    "937e107ab606846d61eec617d09e50d0",
  "infra/specs/test_suite_exceptions.pyl":