Define 2 new Win x64 ANGLE CQ bots

Using chromium.angle recipe One builds Chromium, one only ANGLE tests. Bug: angleproject:4483 Change-Id: I91caff68a787547cdf2fe8e9f44b880db69e7b8c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2698333 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Brian Sheedy <bsheedy@chromium.org> Auto-Submit: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Brian Sheedy <bsheedy@chromium.org> Cr-Commit-Position: refs/heads/master@{#854614}
Denger-Network · Feb 17, 2021 · bd55b33 · bd55b33
1 parent a1de52c
commit bd55b33
Show file tree

Hide file tree

Showing 6 changed files with 180 additions and 0 deletions.
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg
@@ -1493,6 +1493,10 @@ config_groups {
         name: "chromium/try/try-nougat-phone-tester"
         includable_only: true
       }
+      builders {
+        name: "chromium/try/win-angle-chromium-x64-try"
+        includable_only: true
+      }
       builders {
         name: "chromium/try/win-angle-deqp-rel-32"
         includable_only: true
@@ -1509,6 +1513,10 @@ config_groups {
         name: "chromium/try/win-angle-rel-64"
         includable_only: true
       }
+      builders {
+        name: "chromium/try/win-angle-x64-try"
+        includable_only: true
+      }
       builders {
         name: "chromium/try/win-annotator-rel"
         includable_only: true

diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
@@ -47794,6 +47794,67 @@ buckets {
         }
       }
     }
+    builders {
+      name: "win-angle-chromium-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-angle-chromium-x64-try"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      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\":150,\"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\":\"tryserver.chromium.angle\",\"recipe\":\"angle_chromium_trybot\"}"
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.junit_tests"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
     builders {
       name: "win-angle-deqp-rel-32"
       swarming_host: "chromium-swarm.appspot.com"
@@ -48038,6 +48099,67 @@ buckets {
         }
       }
     }
+    builders {
+      name: "win-angle-x64-try"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:win-angle-x64-try"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.try"
+      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\":150,\"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\":\"tryserver.chromium.angle\",\"recipe\":\"angle_chromium_trybot\"}"
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.junit_tests"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
     builders {
       name: "win-annotator-rel"
       swarming_host: "chromium-swarm.appspot.com"

diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
@@ -12830,6 +12830,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/try-nougat-phone-tester"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-angle-chromium-x64-try"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/win-angle-deqp-rel-32"
   }
@@ -12842,6 +12845,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win-angle-rel-64"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-angle-x64-try"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/win-annotator-rel"
   }
@@ -13229,6 +13235,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac-angle-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-angle-chromium-x64-try"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/win-angle-deqp-rel-32"
   }
@@ -13241,6 +13250,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win-angle-rel-64"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/win-angle-x64-try"
+  }
   builder_view_only: true
 }
 consoles {

diff --git a/infra/config/subprojects/chromium/try.star b/infra/config/subprojects/chromium/try.star
@@ -622,6 +622,12 @@ try_.chromium_angle_builder(
     os = os.MAC_ANY,
 )
 
+try_.chromium_angle_builder(
+    name = "win-angle-chromium-x64-try",
+    os = os.WINDOWS_ANY,
+    executable = "recipe:angle_chromium_trybot",
+)
+
 try_.chromium_angle_builder(
     name = "win-angle-deqp-rel-32",
     os = os.WINDOWS_ANY,
@@ -642,6 +648,12 @@ try_.chromium_angle_builder(
     os = os.WINDOWS_ANY,
 )
 
+try_.chromium_angle_builder(
+    name = "win-angle-x64-try",
+    os = os.WINDOWS_ANY,
+    executable = "recipe:angle_chromium_trybot",
+)
+
 try_.chromium_chromiumos_builder(
     name = "chromeos-amd64-generic-cfi-thin-lto-rel",
 )

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
@@ -845,6 +845,8 @@
       'win-angle-rel-64': 'gpu_fyi_tests_release_trybot',
       'win-angle-deqp-rel-32': 'angle_deqp_release_trybot_x86',
       'win-angle-deqp-rel-64': 'angle_deqp_release_trybot',
+      'win-angle-chromium-x64-try': 'gpu_tests_release_trybot',
+      'win-angle-x64-try': 'angle_specific_release_trybot',
     },
 
     'tryserver.chrome': {

diff --git a/tools/mb/mb_config_expectations/tryserver.chromium.angle.json b/tools/mb/mb_config_expectations/tryserver.chromium.angle.json
@@ -185,6 +185,17 @@
       "use_goma": true
     }
   },
+  "win-angle-chromium-x64-try": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
   "win-angle-deqp-rel-32": {
     "gn_args": {
       "build_angle_deqp_tests": true,
@@ -236,5 +247,18 @@
       "symbol_level": 1,
       "use_goma": true
     }
+  },
+  "win-angle-x64-try": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "use_goma": true
+    }
   }
 }