Add Linux Ozone X11 and Wayland bots (src side changes)

This CL adds 3 new bots:
* Linux Ozone Tester (Wayland) on chromium.linux
  - Triggered by linux-ozone-rel
  - All tests have --ozone-platform=wayland
* Linux Ozone Tester (X11) on chromium.linux
  - Triggered by linux-ozone-rel
  - All tests have --ozone-platform=x11
* linux-ozone-x11-and-wayland-rel
  - Trybot that is a combination of the above 2 bots and
    linux-ozone-rel
  - Eventually, linux-ozone-rel (trybot) will inherit this
    bot's config and this bot will be removed.

Requires tools/build change:
https://chromium-review.googlesource.com/c/chromium/src/+/1962128

BUG=1043896
R=estaab

Change-Id: I4b3575526ba485f80d2fb03cfed677aa943b47b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2032518
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738727}

infra/config/buckets/ci.star

@@ -1660,6 +1660,16 @@ ci.linux_builder(
     name = 'Linux Builder (dbg)(32)',
 )
 
+ci.linux_builder(
+    name = 'Linux Ozone Tester (Wayland)',
+    triggered_by = ['ci/linux-ozone-rel'],
+)
+
+ci.linux_builder(
+    name = 'Linux Ozone Tester (X11)',
+    triggered_by = ['ci/linux-ozone-rel'],
+)
+
 ci.linux_builder(
     name = 'Linux Tests (dbg)(1)',
     triggered_by = ['Linux Builder (dbg)'],

infra/config/buckets/try.star

@@ -586,6 +586,13 @@ try_.chromium_linux_builder(
 )
 
 
+try_.chromium_linux_builder(
+    name = 'linux-ozone-x11-and-wayland-rel',
+    tryjob = try_.job(
+        experiment_percentage = 1,
+    ),
+)
+
 try_.chromium_linux_builder(
     name = 'linux-trusty-rel',
     goma_jobs = goma.jobs.J150,

infra/config/consoles/chromium.fyi.star

@@ -163,6 +163,16 @@ luci.console_view(
             category = 'linux',
             short_name = 'lk',
         ),
+        luci.console_view_entry(
+            builder = 'ci/Linux Ozone Tester (Wayland)',
+            category = 'linux',
+            short_name = 'low',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/Linux Ozone Tester (X11)',
+            category = 'linux',
+            short_name = 'lox',
+        ),
         luci.console_view_entry(
             builder = 'ci/Mojo Android',
             category = 'mojo',

infra/config/consoles/luci.chromium.try.star

@@ -104,6 +104,7 @@ luci.list_view(
         'try/linux-chromeos-rel',
         'try/linux-libfuzzer-asan-rel',
         'try/linux-ozone-rel',
+        'try/linux-ozone-x11-and-wayland-rel',
         'try/linux_android_dbg_ng',
         'try/linux_angle_deqp_rel_ng',
         'try/linux_angle_ozone_rel_ng',

infra/config/generated/commit-queue.cfg

@@ -770,6 +770,10 @@ config_groups: <
       builders: <
         name: "chromium/try/linux-ozone-rel"
       >
+      builders: <
+        name: "chromium/try/linux-ozone-x11-and-wayland-rel"
+        experiment_percentage: 1
+      >
       builders: <
         name: "chromium/try/linux-rel"
       >

infra/config/generated/cq-builders.md

@@ -333,6 +333,9 @@ as required builders.
 * [fuchsia-compile-x64-dbg](https://ci.chromium.org/p/chromium/builders/try/fuchsia-compile-x64-dbg) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+fuchsia-compile-x64-dbg)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+fuchsia-compile-x64-dbg))
   * Experiment percentage: 50
 
+* [linux-ozone-x11-and-wayland-rel](https://ci.chromium.org/p/chromium/builders/try/linux-ozone-x11-and-wayland-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-ozone-x11-and-wayland-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-ozone-x11-and-wayland-rel))
+  * Experiment percentage: 1
+
 * [win10_chromium_x64_coverage_rel_ng](https://ci.chromium.org/p/chromium/builders/try/win10_chromium_x64_coverage_rel_ng) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+win10_chromium_x64_coverage_rel_ng)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+win10_chromium_x64_coverage_rel_ng))
   * Experiment percentage: 3
 

infra/config/generated/cr-buildbucket.cfg

@@ -3032,6 +3032,48 @@ buckets: <
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "Linux Ozone Tester (Wayland)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "ssd:0"
+      recipe: <
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      >
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+    >
+    builders: <
+      name: "Linux Ozone Tester (X11)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "ssd:0"
+      recipe: <
+        name: "chromium"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"chromium.linux\""
+      >
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+    >
     builders: <
       name: "Linux Release (NVIDIA)"
       swarming_host: "chromium-swarm.appspot.com"
@@ -16442,6 +16484,35 @@ buckets: <
         value: 5
       >
     >
+    builders: <
+      name: "linux-ozone-x11-and-wayland-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "ssd:0"
+      recipe: <
+        name: "chromium_trybot"
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
+        properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
+        properties_j: "mastername:\"tryserver.chromium.linux\""
+      >
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches: <
+        name: "win_toolchain"
+        path: "win_toolchain"
+      >
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage: <
+        value: 5
+      >
+    >
     builders: <
       name: "linux-rel"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -3069,6 +3069,16 @@ consoles: <
     category: "linux"
     short_name: "lk"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (Wayland)"
+    category: "linux"
+    short_name: "low"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (X11)"
+    category: "linux"
+    short_name: "lox"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Mojo Android"
     category: "mojo"
@@ -10106,6 +10116,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.chromium.try/linux-ozone-rel"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try/linux-ozone-x11-and-wayland-rel"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try/linux_android_dbg_ng"
   >

infra/config/generated/luci-scheduler.cfg

@@ -1708,6 +1708,32 @@ job: <
     builder: "Linux MSan Tests"
   >
 >
+job: <
+  id: "Linux Ozone Tester (Wayland)"
+  acls: <
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  >
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Ozone Tester (Wayland)"
+  >
+>
+job: <
+  id: "Linux Ozone Tester (X11)"
+  acls: <
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  >
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Ozone Tester (X11)"
+  >
+>
 job: <
   id: "Linux TSan Builder"
   acl_sets: "ci"

testing/buildbot/chromium.fyi.json

@@ -40,6 +40,109 @@
       }
     ]
   },
+  "Linux Ozone Tester (Wayland)": {
+    "gtest_tests": []
+  },
+  "Linux Ozone Tester (X11)": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--ozone-platform=x11"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ]
+        },
+        "test": "content_unittests",
+        "test_target": "//content/test:content_unittests"
+      },
+      {
+        "args": [
+          "--ozone-platform=x11"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ]
+        },
+        "test": "ozone_unittests",
+        "test_target": "//ui/ozone:ozone_unittests"
+      },
+      {
+        "args": [
+          "--ozone-platform=x11"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ]
+        },
+        "test": "ozone_x11_unittests",
+        "test_target": "//ui/ozone:ozone_x11_unittests"
+      },
+      {
+        "args": [
+          "--ozone-platform=x11"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ]
+        },
+        "test": "services_unittests",
+        "test_target": "//services:services_unittests"
+      },
+      {
+        "args": [
+          "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_views_unittests.filter",
+          "--ozone-platform=x11"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ]
+        },
+        "test": "views_unittests",
+        "test_target": "//ui/views:views_unittests"
+      }
+    ]
+  },
   "Linux Viz": {
     "additional_compile_targets": [
       "all"

testing/buildbot/test_suites.pyl

@@ -2949,6 +2949,22 @@
       }
     },
 
+    'ozone_linux_gtests_wayland': {
+      # TODO(crbug.com/1029241): Add tests once third_party weston is added.
+    },
+
+    'ozone_linux_gtests_x11': {
+      'content_unittests': {},
+      'ozone_unittests': {},
+      'ozone_x11_unittests': {},
+      'services_unittests': {},
+      'views_unittests': {
+        'args': [
+          '--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_views_unittests.filter',
+        ],
+      }
+    },
+
     'performance_smoke_test_isolated_scripts': {
       'performance_test_suite': {
         'args': [

testing/buildbot/waterfalls.pyl

@@ -1518,6 +1518,24 @@
           'gtest_tests': 'goma_gtests',
         },
       },
+      'Linux Ozone Tester (Wayland)': {
+        'args': [ '--ozone-platform=wayland' ],
+        'mixins': [
+          'linux-xenial',
+         ],
+        'test_suites': {
+         'gtest_tests': 'ozone_linux_gtests_wayland',
+        },
+      },
+      'Linux Ozone Tester (X11)': {
+        'args': [ '--ozone-platform=x11' ],
+        'mixins': [
+          'linux-xenial',
+        ],
+        'test_suites': {
+         'gtest_tests': 'ozone_linux_gtests_x11',
+        },
+      },
       'Linux Viz': {
         'mixins': [
           'linux-xenial',

tools/mb/mb_config.pyl

@@ -834,6 +834,7 @@
       'linux-gcc-rel': 'release_bot_x86_minimal_symbols_no_clang_cxx11',
       'linux-libfuzzer-asan-rel': 'libfuzzer_asan_release_trybot',
       'linux-ozone-rel': 'ozone_linux_release_trybot',
+      'linux-ozone-x11-and-wayland-rel': 'ozone_linux_release_trybot',
       'linux-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage',
       'linux-trusty-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange',
       'linux-viz-rel': 'release_trybot',

tools/mb/mb_config_buckets.pyl

@@ -815,6 +815,7 @@
       'linux-layout-tests-fragment-paint': 'release_trybot',
       'linux-libfuzzer-asan-rel': 'libfuzzer_asan_release_trybot',
       'linux-ozone-rel': 'ozone_linux_release_trybot',
+      'linux-ozone-x11-and-wayland-rel': 'ozone_linux_release_trybot',
       'linux-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage',
       'linux-swangle-try-tot-angle-x64': 'deqp_release_trybot',
       'linux-swangle-try-tot-angle-x86': 'deqp_release_trybot_x86',
@@ -1158,6 +1159,7 @@
       'linux-layout-tests-fragment-paint': 'release_trybot',
       'linux-libfuzzer-asan-rel': 'libfuzzer_asan_release_trybot',
       'linux-ozone-rel': 'ozone_linux_release_trybot',
+      'linux-ozone-x11-and-wayland-rel': 'ozone_linux_release_trybot',
       'linux-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage',
       'linux-swangle-try-tot-angle-x64': 'deqp_release_trybot',
       'linux-swangle-try-tot-angle-x86': 'deqp_release_trybot_x86',
@@ -1413,6 +1415,7 @@
       'linux-layout-tests-fragment-paint': 'release_trybot',
       'linux-libfuzzer-asan-rel': 'libfuzzer_asan_release_trybot',
       'linux-ozone-rel': 'ozone_linux_release_trybot',
+      'linux-ozone-x11-and-wayland-rel': 'ozone_linux_release_trybot',
       'linux-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage',
       'linux-swangle-try-tot-angle-x64': 'deqp_release_trybot',
       'linux-swangle-try-tot-angle-x86': 'deqp_release_trybot_x86',