Enable containment for some gpu bots

This is (as far as I know) the first time chromium is using containment,
so I'm enabling on a bot which shouldn't affect the CQ that much. Once
this lands, I'll enable on the rest of the CQ bots.

Bug: 965222
Change-Id: Ie0f85f50eec68c4de89f12047209b9ad570ec129
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1626149Reviewed-by: Aaron Gable <agable@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662823}

docs/infra/cq_builders.md

@@ -239,6 +239,7 @@ builder.
     * [`//media/audio/.+`](https://cs.chromium.org/chromium/src/media/audio/)
     * [`//media/filters/.+`](https://cs.chromium.org/chromium/src/media/filters/)
     * [`//media/gpu/.+`](https://cs.chromium.org/chromium/src/media/gpu/)
+    * [`//testing/buildbot/chromium.gpu.fyi.json`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:testing/buildbot/chromium.gpu.fyi.json)
     * [`//testing/trigger_scripts/.+`](https://cs.chromium.org/chromium/src/testing/trigger_scripts/)
     * [`//third_party/blink/renderer/modules/webgl/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgl/)
     * [`//third_party/blink/renderer/platform/graphics/gpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/gpu/)
@@ -259,6 +260,7 @@ builder.
     * [`//media/filters/.+`](https://cs.chromium.org/chromium/src/media/filters/)
     * [`//media/gpu/.+`](https://cs.chromium.org/chromium/src/media/gpu/)
     * [`//services/shape_detection/.+`](https://cs.chromium.org/chromium/src/services/shape_detection/)
+    * [`//testing/buildbot/chromium.gpu.fyi.json`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:testing/buildbot/chromium.gpu.fyi.json)
     * [`//testing/trigger_scripts/.+`](https://cs.chromium.org/chromium/src/testing/trigger_scripts/)
     * [`//third_party/blink/renderer/modules/webgl/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgl/)
     * [`//third_party/blink/renderer/platform/graphics/gpu/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/gpu/)
@@ -274,6 +276,7 @@ builder.
     * [`//media/audio/.+`](https://cs.chromium.org/chromium/src/media/audio/)
     * [`//media/filters/.+`](https://cs.chromium.org/chromium/src/media/filters/)
     * [`//media/gpu/.+`](https://cs.chromium.org/chromium/src/media/gpu/)
+    * [`//testing/buildbot/chromium.gpu.fyi.json`](https://cs.chromium.org/search/?q=package:%5Echromium$+file:testing/buildbot/chromium.gpu.fyi.json)
     * [`//testing/trigger_scripts/.+`](https://cs.chromium.org/chromium/src/testing/trigger_scripts/)
     * [`//third_party/blink/renderer/modules/vr/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/vr/)
     * [`//third_party/blink/renderer/modules/webgl/.+`](https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/webgl/)

infra/config/commit-queue.cfg

@@ -291,6 +291,7 @@ config_groups {
         location_regexp: ".+/[+]/media/audio/.+"
         location_regexp: ".+/[+]/media/filters/.+"
         location_regexp: ".+/[+]/media/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.gpu.fyi.json"
         location_regexp: ".+/[+]/testing/trigger_scripts/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
@@ -309,6 +310,7 @@ config_groups {
         location_regexp: ".+/[+]/media/filters/.+"
         location_regexp: ".+/[+]/media/gpu/.+"
         location_regexp: ".+/[+]/services/shape_detection/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.gpu.fyi.json"
         location_regexp: ".+/[+]/testing/trigger_scripts/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+"
@@ -323,6 +325,7 @@ config_groups {
         location_regexp: ".+/[+]/media/audio/.+"
         location_regexp: ".+/[+]/media/filters/.+"
         location_regexp: ".+/[+]/media/gpu/.+"
+        location_regexp: ".+/[+]/testing/buildbot/chromium.gpu.fyi.json"
         location_regexp: ".+/[+]/testing/trigger_scripts/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/vr/.+"
         location_regexp: ".+/[+]/third_party/blink/renderer/modules/webgl/.+"

testing/buildbot/chromium.gpu.fyi.json

@@ -20456,6 +20456,7 @@
         "should_retry_with_patch": false,
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20477,6 +20478,7 @@
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20498,6 +20500,7 @@
         "should_retry_with_patch": false,
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20520,6 +20523,7 @@
         "name": "gl_tests_passthrough",
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20540,6 +20544,7 @@
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20562,6 +20567,7 @@
         "name": "gles2_conform_d3d9_test",
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20585,6 +20591,7 @@
         "name": "gles2_conform_gl_test",
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20602,6 +20609,7 @@
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20619,6 +20627,7 @@
         },
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20642,6 +20651,7 @@
         "name": "video_decode_accelerator_d3d9_unittest",
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20663,6 +20673,7 @@
         "name": "xr_browser_tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20691,6 +20702,7 @@
         "name": "angle_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20722,6 +20734,7 @@
         "should_retry_with_patch": false,
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20773,6 +20786,7 @@
         "should_retry_with_patch": false,
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20802,6 +20816,7 @@
         "should_retry_with_patch": false,
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20830,6 +20845,7 @@
         "should_retry_with_patch": false,
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20860,6 +20876,7 @@
         "should_retry_with_patch": false,
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20889,6 +20906,7 @@
         "should_retry_with_patch": false,
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20918,6 +20936,7 @@
         "should_retry_with_patch": false,
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20947,6 +20966,7 @@
         "should_retry_with_patch": false,
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",
@@ -20976,6 +20996,7 @@
         "should_retry_with_patch": false,
         "swarming": {
           "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
           "dimension_sets": [
             {
               "gpu": "intel-hd-630-win10-stable",

testing/buildbot/mixins.pyl

@@ -509,6 +509,11 @@
       },
     },
   },
+  'swarming_containment_auto': {
+    'swarming': {
+      'containment_type': 'AUTO',
+    },
+  },
   'walleye': {
     # Pixel 2
     'swarming': {

testing/buildbot/waterfalls.pyl

@@ -3021,6 +3021,7 @@
         'os_type': 'win',
         'browser_config': 'release',
         'mixins': [
+          'swarming_containment_auto',
           'win10_intel_hd_630_stable',
         ],
         'test_suites': {