Ozone/Linux CI: add CI Test configuration.

This CL adds Ozone/Linux CI Test configuration. Initially, it will run the same gtests as CQ Test configuration to be sure the config is correct. Later, when the testers are up and running on CI, chromium_linux_gtests will be used instead. R=dpranke CC=msisov Bug: 1142753 Change-Id: If1173c93f12774569c257dd8ad04abab2f99a434 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2529098 Commit-Queue: Maksim Sisov (GMT+2) <msisov@igalia.com> Reviewed-by: Dirk Pranke <dpranke@google.com> Cr-Commit-Position: refs/heads/master@{#826188}

Ozone/Linux CI: add CI Test configuration.
This CL adds Ozone/Linux CI Test configuration. Initially, it will run the same gtests as CQ Test configuration to be sure the config is correct. Later, when the testers are up and running on CI, chromium_linux_gtests will be used instead. R=dpranke CC=msisov Bug: 1142753 Change-Id: If1173c93f12774569c257dd8ad04abab2f99a434 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2529098 Commit-Queue: Maksim Sisov (GMT+2) <msisov@igalia.com> Reviewed-by: Dirk Pranke <dpranke@google.com> Cr-Commit-Position: refs/heads/master@{#826188}
4332410f · Maksim Sisov · Commit Bot · d4354335 · 4332410f · 4332410f
Commit 4332410f authored Nov 11, 2020 by Maksim Sisov Committed by Commit Bot Nov 11, 2020
7 changed files
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -7051,6 +7051,147 @@ buckets {
        }
      }
    }
+    builders {
+      name: "Linux Tester (Ozone Headless)"
+      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: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+      }
+    }
+    builders {
+      name: "Linux Tester (Ozone 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: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+      }
+    }
+    builders {
+      name: "Linux Tester (Ozone 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: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"jobs\":500,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.linux\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 50
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+      }
+    }
    builders {
      name: "Linux Tests"
      swarming_host: "chromium-swarm.appspot.com"
--- a/infra/config/generated/luci-milo.cfg
+++ b/infra/config/generated/luci-milo.cfg
@@ -245,6 +245,21 @@ consoles {
    category: "chromium.linux|release"
    short_name: "tru"
  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Tester (Ozone Headless)"
+    category: "chromium.linux|release|ozone"
+    short_name: "ltoh"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Tester (Ozone Wayland)"
+    category: "chromium.linux|release|ozone"
+    short_name: "ltow"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Tester (Ozone X11)"
+    category: "chromium.linux|release|ozone"
+    short_name: "ltox"
+  }
  builders {
    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
    category: "chromium.linux|debug|builder"
@@ -869,6 +884,21 @@ consoles {
    category: "chromium.linux|release"
    short_name: "ozo"
  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Tester (Ozone Headless)"
+    category: "chromium.linux|release|ozone"
+    short_name: "ltoh"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Tester (Ozone Wayland)"
+    category: "chromium.linux|release|ozone"
+    short_name: "ltow"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Tester (Ozone X11)"
+    category: "chromium.linux|release|ozone"
+    short_name: "ltox"
+  }
  builders {
    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)"
    category: "chromium.linux|debug|builder"
@@ -7553,6 +7583,21 @@ consoles {
    category: "release"
    short_name: "tru"
  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Tester (Ozone Headless)"
+    category: "release|ozone"
+    short_name: "ltoh"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Tester (Ozone Wayland)"
+    category: "release|ozone"
+    short_name: "ltow"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Tester (Ozone X11)"
+    category: "release|ozone"
+    short_name: "ltox"
+  }
  builders {
    name: "buildbucket/luci.chromium.ci/Linux Builder (dbg)(32)"
    category: "debug|builder"

--- a/infra/config/generated/luci-notify.cfg
+++ b/infra/config/generated/luci-notify.cfg
@@ -1239,6 +1239,45 @@ notifiers {
    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
  }
 }
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux Tester (Ozone Headless)"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux Tester (Ozone Wayland)"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
+    email {
+      recipients: "thomasanderson@chromium.org"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "Linux Tester (Ozone X11)"
+  }
+}
 notifiers {
  notifications {
    on_occurrence: FAILURE

--- a/infra/config/generated/luci-scheduler.cfg
+++ b/infra/config/generated/luci-scheduler.cfg
@@ -2008,6 +2008,48 @@ job {
    builder: "Linux TSan Tests"
  }
 }
+job {
+  id: "Linux Tester (Ozone Headless)"
+  realm: "ci"
+  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 Tester (Ozone Headless)"
+  }
+}
+job {
+  id: "Linux Tester (Ozone Wayland)"
+  realm: "ci"
+  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 Tester (Ozone Wayland)"
+  }
+}
+job {
+  id: "Linux Tester (Ozone X11)"
+  realm: "ci"
+  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 Tester (Ozone X11)"
+  }
+}
 job {
  id: "Linux Tests"
  realm: "ci"

--- a/infra/config/subprojects/chromium/ci.star
+++ b/infra/config/subprojects/chromium/ci.star
@@ -4300,6 +4300,48 @@ ci.linux_builder(
    triggered_by = [builder_name("linux-ozone-rel")],
 )

+ci.linux_builder(
+    # CI tester for Ozone/Headless
+    name = "Linux Tester (Ozone Headless)",
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = ci.console_view_entry(
+        category = "release|ozone",
+        short_name = "ltoh",
+    ),
+    main_console_view = "main",
+    cq_mirrors_console_view = "mirrors",
+    triggered_by = [builder_name("linux-ozone-rel")],
+    tree_closing = False,
+)
+
+ci.linux_builder(
+    # CI tester for Ozone/Wayland
+    name = "Linux Tester (Ozone Wayland)",
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = ci.console_view_entry(
+        category = "release|ozone",
+        short_name = "ltow",
+    ),
+    main_console_view = "main",
+    cq_mirrors_console_view = "mirrors",
+    triggered_by = [builder_name("linux-ozone-rel")],
+    tree_closing = False,
+)
+
+ci.linux_builder(
+    # CI tester for Ozone/X11
+    name = "Linux Tester (Ozone X11)",
+    branch_selector = branches.STANDARD_MILESTONE,
+    console_view_entry = ci.console_view_entry(
+        category = "release|ozone",
+        short_name = "ltox",
+    ),
+    main_console_view = "main",
+    cq_mirrors_console_view = "mirrors",
+    triggered_by = [builder_name("linux-ozone-rel")],
+    tree_closing = False,
+)
+
 ci.linux_builder(
    name = "linux-trusty-rel",
    console_view_entry = ci.console_view_entry(

--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -4580,6 +4580,30 @@
         'gtest_tests': 'linux_ozone_x11_tests',
        },
      },
+      'Linux Tester (Ozone Headless)': {
+        'mixins': [
+          'linux-xenial',
+         ],
+        'test_suites': {
+         'gtest_tests': 'linux_ozone_headless_tests',
+        },
+      },
+      'Linux Tester (Ozone Wayland)': {
+        'mixins': [
+          'linux-xenial',
+         ],
+        'test_suites': {
+         'gtest_tests': 'linux_ozone_wayland_tests',
+        },
+      },
+      'Linux Tester (Ozone X11)': {
+        'mixins': [
+          'linux-xenial',
+        ],
+        'test_suites': {
+         'gtest_tests': 'linux_ozone_x11_tests',
+        },
+      },
      'Linux Tests': {
        'mixins': [
          'isolate_profile_data',