[ci.yaml] Nest tags under properties (#86364)

.ci.yaml

@@ -11,21 +11,17 @@ enabled_branches:
 targets:
   - name: Linux analyze
     builder: Linux analyze
+    properties:
+      tags: >
+        ["framework","hostonly"]
     scheduler: luci
-    tags:
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Linux build_aar_module_test
     builder: Linux build_aar_module_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -33,44 +29,32 @@ targets:
 
   - name: Linux customer_testing
     builder: Linux customer_testing
+    properties:
+      tags: >
+        ["framework","hostonly"]
     scheduler: luci
-    tags:
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Linux build_tests_1_2
     builder: Linux build_tests_1_2
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Linux build_tests_2_2
     builder: Linux build_tests_2_2
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Linux docs
     builder: Linux docs
     postsubmit: false
+    properties:
+      tags: >
+        ["framework","hostonly"]
     scheduler: luci
-    tags:
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter/
@@ -81,14 +65,10 @@ targets:
 
   - name: Linux framework_tests_libraries
     builder: Linux framework_tests_libraries
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter/
@@ -103,14 +83,10 @@ targets:
 
   - name: Linux framework_tests_misc
     builder: Linux framework_tests_misc
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter/
@@ -125,14 +101,10 @@ targets:
 
   - name: Linux framework_tests_widgets
     builder: Linux framework_tests_widgets
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter/
@@ -147,68 +119,58 @@ targets:
 
   - name: Linux firebase_abstract_method_smoke_test
     builder: Linux firebase_abstract_method_smoke_test
+    properties:
+      tags: >
+        ["firebaselab"]
     scheduler: luci
-    tags:
-      - key: firebaselab
-        value: "true"
 
   - name: Linux firebase_android_embedding_v2_smoke_test
     builder: Linux firebase_android_embedding_v2_smoke_test
+    properties:
+      tags: >
+        ["firebaselab"]
     scheduler: luci
-    tags:
-      - key: firebaselab
-        value: "true"
 
   - name: Linux firebase_release_smoke_test
     builder: Linux firebase_release_smoke_test
+    properties:
+      tags: >
+        ["firebaselab"]
     scheduler: luci
-    tags:
-      - key: firebaselab
-        value: "true"
 
   - name: Linux fuchsia_precache
     builder: Linux fuchsia_precache
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Linux gradle_desugar_classes_test
     builder: Linux gradle_desugar_classes_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - bin/**
 
   - name: Linux gradle_plugin_bundle_test
     builder: Linux gradle_plugin_bundle_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - bin/**
 
   - name: Linux gradle_plugin_fat_apk_test
     builder: Linux gradle_plugin_fat_apk_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - bin/**
@@ -216,24 +178,20 @@ targets:
   - name: Linux gradle_plugin_light_apk_test
     builder: Linux gradle_plugin_light_apk_test
     postsubmit: false
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - bin/**
 
   - name: Linux module_host_with_custom_build_test
     builder: Linux module_host_with_custom_build_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -241,12 +199,10 @@ targets:
 
   - name: Linux module_custom_host_app_name_test
     builder: Linux module_custom_host_app_name_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -254,12 +210,10 @@ targets:
 
   - name: Linux module_test
     builder: Linux module_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -267,12 +221,10 @@ targets:
 
   - name: Linux plugin_test
     builder: Linux plugin_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -280,14 +232,10 @@ targets:
 
   - name: Linux skp_generator
     builder: Linux skp_generator
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter/
@@ -296,14 +244,10 @@ targets:
 
   - name: Linux tool_tests_general
     builder: Linux tool_tests_general
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter_tools/
@@ -311,14 +255,10 @@ targets:
 
   - name: Linux tool_tests_commands
     builder: Linux tool_tests_commands
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter_tools/
@@ -326,14 +266,10 @@ targets:
 
   - name: Linux tool_integration_tests_1_4
     builder: Linux tool_integration_tests_1_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter_tools/
@@ -341,14 +277,10 @@ targets:
 
   - name: Linux tool_integration_tests_2_4
     builder: Linux tool_integration_tests_2_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter_tools/
@@ -356,14 +288,10 @@ targets:
 
   - name: Linux tool_integration_tests_3_4
     builder: Linux tool_integration_tests_3_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter_tools/
@@ -371,14 +299,10 @@ targets:
 
   - name: Linux tool_integration_tests_4_4
     builder: Linux tool_integration_tests_4_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter_tools/
@@ -386,14 +310,10 @@ targets:
 
   - name: Linux web_tool_tests
     builder: Linux web_tool_tests
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter_tools/
@@ -401,24 +321,20 @@ targets:
 
   - name: Linux web_benchmarks_html
     builder: Linux web_benchmarks_html
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
     runIf:
       - dev/**
       - bin/**
 
   - name: Linux web_tests_0
     builder: Linux web_tests_0
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -426,14 +342,10 @@ targets:
 
   - name: Linux web_tests_1
     builder: Linux web_tests_1
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -441,14 +353,10 @@ targets:
 
   - name: Linux web_tests_2
     builder: Linux web_tests_2
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -456,14 +364,10 @@ targets:
 
   - name: Linux web_tests_3
     builder: Linux web_tests_3
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -471,14 +375,10 @@ targets:
 
   - name: Linux web_tests_4
     builder: Linux web_tests_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -486,14 +386,10 @@ targets:
 
   - name: Linux web_tests_5
     builder: Linux web_tests_5
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -501,14 +397,10 @@ targets:
 
   - name: Linux web_tests_6
     builder: Linux web_tests_6
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -516,14 +408,10 @@ targets:
 
   - name: Linux web_tests_7_last
     builder: Linux web_tests_7_last
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -531,14 +419,10 @@ targets:
 
   - name: Linux web_long_running_tests_1_5
     builder: Linux web_long_running_tests_1_5
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -546,14 +430,10 @@ targets:
 
   - name: Linux web_long_running_tests_2_5
     builder: Linux web_long_running_tests_2_5
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -561,14 +441,10 @@ targets:
 
   - name: Linux web_long_running_tests_3_5
     builder: Linux web_long_running_tests_3_5
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -576,14 +452,10 @@ targets:
 
   - name: Linux web_long_running_tests_4_5
     builder: Linux web_long_running_tests_4_5
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -591,14 +463,10 @@ targets:
 
   - name: Linux web_long_running_tests_5_5
     builder: Linux web_long_running_tests_5_5
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/
@@ -606,23 +474,17 @@ targets:
 
   - name: Linux flutter_plugins
     builder: Linux flutter_plugins
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Mac build_aar_module_test
     builder: Mac build_aar_module_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -630,12 +492,10 @@ targets:
 
   - name: Mac build_ios_framework_module_test
     builder: Mac build_ios_framework_module_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -643,67 +503,45 @@ targets:
 
   - name: Mac build_tests_1_4
     builder: Mac build_tests_1_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Mac build_tests_2_4
     builder: Mac build_tests_2_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Mac build_tests_3_4
     builder: Mac build_tests_3_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Mac build_tests_4_4
     builder: Mac build_tests_4_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Mac customer_testing
     builder: Mac customer_testing
+    properties:
+      tags: >
+        ["framework","hostonly"]
     scheduler: luci
-    tags:
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Mac framework_tests_libraries
     builder: Mac framework_tests_libraries
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter/**
@@ -718,14 +556,10 @@ targets:
 
   - name: Mac framework_tests_misc
     builder: Mac framework_tests_misc
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter/**
@@ -740,14 +574,10 @@ targets:
 
   - name: Mac framework_tests_widgets
     builder: Mac framework_tests_widgets
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter/**
@@ -762,48 +592,40 @@ targets:
 
   - name: Mac gradle_plugin_bundle_test
     builder: Mac gradle_plugin_bundle_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - bin/**
 
   - name: Mac gradle_plugin_fat_apk_test
     builder: Mac gradle_plugin_fat_apk_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - bin/**
 
   - name: Mac gradle_plugin_light_apk_test
     builder: Mac gradle_plugin_light_apk_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - bin/**
 
   - name: Mac module_custom_host_app_name_test
     builder: Mac module_custom_host_app_name_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -811,12 +633,10 @@ targets:
 
   - name: Mac module_host_with_custom_build_test
     builder: Mac module_host_with_custom_build_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -824,12 +644,10 @@ targets:
 
   - name: Mac module_test
     builder: Mac module_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -837,13 +655,11 @@ targets:
 
   - name: Mac module_test_ios
     builder: Mac module_test_ios
+    bringup: true
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    bringup: true # Flaky https://github.com/flutter/flutter/issues/85578
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -851,24 +667,20 @@ targets:
 
   - name: Mac plugin_lint_mac
     builder: Mac plugin_lint_mac
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - bin/**
 
   - name: Mac plugin_test
     builder: Mac plugin_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -876,12 +688,10 @@ targets:
 
   - name: Mac dart_plugin_registry_test
     builder: Mac dart_plugin_registry_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -889,14 +699,10 @@ targets:
 
   - name: Mac tool_tests_general
     builder: Mac tool_tests_general
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -904,14 +710,10 @@ targets:
 
   - name: Windows tool_tests_commands
     builder: Windows tool_tests_commands
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -919,14 +721,10 @@ targets:
 
   - name: Mac tool_integration_tests_1_4
     builder: Mac tool_integration_tests_1_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -934,14 +732,10 @@ targets:
 
   - name: Mac tool_integration_tests_2_4
     builder: Mac tool_integration_tests_2_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -949,14 +743,10 @@ targets:
 
   - name: Mac tool_integration_tests_3_4
     builder: Mac tool_integration_tests_3_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -964,14 +754,10 @@ targets:
 
   - name: Mac tool_integration_tests_4_4
     builder: Mac tool_integration_tests_4_4
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -980,14 +766,10 @@ targets:
   - name: Mac web_tool_tests
     builder: Mac web_tool_tests
     postsubmit: false
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -995,12 +777,10 @@ targets:
 
   - name: Windows build_aar_module_test
     builder: Windows build_aar_module_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -1008,56 +788,38 @@ targets:
 
   - name: Windows build_tests_1_3
     builder: Windows build_tests_1_3
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Windows build_tests_2_3
     builder: Windows build_tests_2_3
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Windows build_tests_3_3
     builder: Windows build_tests_3_3
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Windows customer_testing
     builder: Windows customer_testing
+    properties:
+      tags: >
+        ["framework","hostonly"]
     scheduler: luci
-    tags:
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Windows framework_tests_libraries
     builder: Windows framework_tests_libraries
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter/
@@ -1072,14 +834,10 @@ targets:
 
   - name: Windows framework_tests_misc
     builder: Windows framework_tests_misc
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter/
@@ -1094,14 +852,10 @@ targets:
 
   - name: Windows framework_tests_widgets
     builder: Windows framework_tests_widgets
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/
       - packages/flutter/
@@ -1116,36 +870,30 @@ targets:
 
   - name: Windows gradle_plugin_bundle_test
     builder: Windows gradle_plugin_bundle_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - bin/**
 
   - name: Windows gradle_plugin_light_apk_test
     builder: Windows gradle_plugin_light_apk_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - bin/**
 
   - name: Windows module_custom_host_app_name_test
     builder: Windows module_custom_host_app_name_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -1153,12 +901,10 @@ targets:
 
   - name: Windows module_test
     builder: Windows module_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -1166,12 +912,10 @@ targets:
 
   - name: Windows module_host_with_custom_build_test
     builder: Windows module_host_with_custom_build_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -1179,12 +923,10 @@ targets:
 
   - name: Windows plugin_test
     builder: Windows plugin_test
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -1192,14 +934,10 @@ targets:
 
   - name: Windows tool_tests_general
     builder: Windows tool_tests_general
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -1207,14 +945,10 @@ targets:
 
   - name: Windows tool_integration_tests_1_5
     builder: Windows tool_integration_tests_1_5
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -1222,14 +956,10 @@ targets:
 
   - name: Windows tool_integration_tests_2_5
     builder: Windows tool_integration_tests_2_5
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -1237,14 +967,10 @@ targets:
 
   - name: Windows tool_integration_tests_3_5
     builder: Windows tool_integration_tests_3_5
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -1252,14 +978,10 @@ targets:
 
   - name: Windows tool_integration_tests_4_5
     builder: Windows tool_integration_tests_4_5
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -1267,14 +989,10 @@ targets:
 
   - name: Windows tool_integration_tests_5_5
     builder: Windows tool_integration_tests_5_5
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -1282,14 +1000,10 @@ targets:
 
   - name: Windows web_tool_tests
     builder: Windows web_tool_tests
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
     runIf:
       - dev/**
       - packages/flutter_tools/**
@@ -1298,1139 +1012,1125 @@ targets:
   - name: Linux analyzer_benchmark
     builder: Linux analyzer_benchmark
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux android_defines_test
     builder: Linux android_defines_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux android_obfuscate_test
     builder: Linux android_obfuscate_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux android_stack_size_test
     builder: Linux android_stack_size_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux android_view_scroll_perf__timeline_summary
     builder: Linux android_view_scroll_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux animated_placeholder_perf__e2e_summary
     builder: Linux animated_placeholder_perf__e2e_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux backdrop_filter_perf__e2e_summary
     builder: Linux backdrop_filter_perf__e2e_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux basic_material_app_android__compile
     builder: Linux basic_material_app_android__compile
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux color_filter_and_fade_perf__e2e_summary
     builder: Linux color_filter_and_fade_perf__e2e_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux complex_layout_android__compile
     builder: Linux complex_layout_android__compile
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux complex_layout_android__scroll_smoothness
     builder: Linux complex_layout_android__scroll_smoothness
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux complex_layout_scroll_perf__devtools_memory
     builder: Linux complex_layout_scroll_perf__devtools_memory
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux complex_layout_semantics_perf
     builder: Linux complex_layout_semantics_perf
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux cubic_bezier_perf__e2e_summary
     builder: Linux cubic_bezier_perf__e2e_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux cubic_bezier_perf_sksl_warmup__e2e_summary
     builder: Linux cubic_bezier_perf_sksl_warmup__e2e_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux cull_opacity_perf__e2e_summary
     builder: Linux cull_opacity_perf__e2e_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux docs_test
     builder: Linux docs_test
     bringup: true # Flaky https://github.com/flutter/flutter/issues/84609
     presubmit: false
+    properties:
+      tags: >
+        ["framework","hostonly"]
     scheduler: luci
-    tags:
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Linux docs_publish
     builder: Linux docs_publish
     presubmit: false
+    properties:
+      tags: >
+        ["framework","hostonly"]
     scheduler: luci
-    tags:
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Linux fast_scroll_heavy_gridview__memory
     builder: Linux fast_scroll_heavy_gridview__memory
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_engine_group_performance
     builder: Linux flutter_engine_group_performance
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery__back_button_memory
     builder: Linux flutter_gallery__back_button_memory
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery__image_cache_memory
     builder: Linux flutter_gallery__image_cache_memory
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery__memory_nav
     builder: Linux flutter_gallery__memory_nav
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery__start_up
     builder: Linux flutter_gallery__start_up
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery__transition_perf_e2e
     builder: Linux flutter_gallery__transition_perf_e2e
     bringup: true # Flaky https://github.com/flutter/flutter/issues/83298
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery__transition_perf_hybrid
     builder: Linux flutter_gallery__transition_perf_hybrid
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery__transition_perf_with_semantics
     builder: Linux flutter_gallery__transition_perf_with_semantics
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery__transition_perf
     builder: Linux flutter_gallery__transition_perf
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery_android__compile
     builder: Linux flutter_gallery_android__compile
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery_sksl_warmup__transition_perf_e2e
     builder: Linux flutter_gallery_sksl_warmup__transition_perf_e2e
     bringup: true # Flaky https://github.com/flutter/flutter/issues/83298
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery_sksl_warmup__transition_perf
     builder: Linux flutter_gallery_sksl_warmup__transition_perf
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery_v2_chrome_run_test
     builder: Linux flutter_gallery_v2_chrome_run_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_gallery_v2_web_compile_test
     builder: Linux flutter_gallery_v2_web_compile_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux flutter_test_performance
     builder: Linux flutter_test_performance
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux frame_policy_delay_test_android
     builder: Linux frame_policy_delay_test_android
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux hot_mode_dev_cycle_linux__benchmark
     builder: Linux hot_mode_dev_cycle_linux__benchmark
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux image_list_jit_reported_duration
     builder: Linux image_list_jit_reported_duration
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux image_list_reported_duration
     builder: Linux image_list_reported_duration
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux large_image_changer_perf_android
     builder: Linux large_image_changer_perf_android
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux animated_image_gc_perf
     builder: Linux animated_image_gc_perf
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux linux_chrome_dev_mode
     builder: Linux linux_chrome_dev_mode
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux multi_widget_construction_perf__e2e_summary
     builder: Linux multi_widget_construction_perf__e2e_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux new_gallery__crane_perf
     builder: Linux new_gallery__crane_perf
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux picture_cache_perf__e2e_summary
     builder: Linux picture_cache_perf__e2e_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux platform_channels_benchmarks
     builder: Linux platform_channels_benchmarks
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux platform_views_scroll_perf__timeline_summary
     builder: Linux platform_views_scroll_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux routing_test
     builder: Linux routing_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux technical_debt__cost
     builder: Linux technical_debt__cost
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
 
   - name: Linux textfield_perf__e2e_summary
     builder: Linux textfield_perf__e2e_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Linux web_benchmarks_canvaskit
     builder: Linux web_benchmarks_canvaskit
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
 
   - name: Linux web_size__compile_test
     builder: Linux web_size__compile_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android android_semantics_integration_test
     builder: Mac_android android_semantics_integration_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android backdrop_filter_perf__timeline_summary
     builder: Mac_android backdrop_filter_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android channels_integration_test
     builder: Mac_android channels_integration_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android color_filter_and_fade_perf__timeline_summary
     builder: Mac_android color_filter_and_fade_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android complex_layout__start_up
     builder: Mac_android complex_layout__start_up
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android complex_layout_scroll_perf__memory
     builder: Mac_android complex_layout_scroll_perf__memory
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android complex_layout_scroll_perf__timeline_summary
     builder: Mac_android complex_layout_scroll_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android cubic_bezier_perf__timeline_summary
     builder: Mac_android cubic_bezier_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android cubic_bezier_perf_sksl_warmup__timeline_summary
     builder: Mac_android cubic_bezier_perf_sksl_warmup__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android cull_opacity_perf__timeline_summary
     builder: Mac_android cull_opacity_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android drive_perf_debug_warning
     builder: Mac_android drive_perf_debug_warning
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android embedded_android_views_integration_test
     builder: Mac_android embedded_android_views_integration_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android external_ui_integration_test
     builder: Mac_android external_ui_integration_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android fading_child_animation_perf__timeline_summary
     builder: Mac_android fading_child_animation_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android fast_scroll_large_images__memory
     builder: Mac_android fast_scroll_large_images__memory
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android flavors_test
     builder: Mac_android flavors_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android flutter_view__start_up
     builder: Mac_android flutter_view__start_up
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android fullscreen_textfield_perf__timeline_summary
     builder: Mac_android fullscreen_textfield_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android hello_world__memory
     builder: Mac_android hello_world__memory
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android hello_world_android__compile
     builder: Mac_android hello_world_android__compile
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android home_scroll_perf__timeline_summary
     builder: Mac_android home_scroll_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android hot_mode_dev_cycle__benchmark
     builder: Mac_android hot_mode_dev_cycle__benchmark
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android hybrid_android_views_integration_test
     builder: Mac_android hybrid_android_views_integration_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android imagefiltered_transform_animation_perf__timeline_summary
     builder: Mac_android imagefiltered_transform_animation_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android integration_ui_driver
     builder: Mac_android integration_ui_driver
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android integration_ui_keyboard_resize
     builder: Mac_android integration_ui_keyboard_resize
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android integration_ui_screenshot
     builder: Mac_android integration_ui_screenshot
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android integration_ui_textfield
     builder: Mac_android integration_ui_textfield
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android integration_test_test
     builder: Mac_android integration_test_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android microbenchmarks
     builder: Mac_android microbenchmarks
     bringup: true
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android new_gallery__transition_perf
     builder: Mac_android new_gallery__transition_perf
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android picture_cache_perf__timeline_summary
     builder: Mac_android picture_cache_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android platform_channel_sample_test
     builder: Mac_android platform_channel_sample_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android platform_interaction_test
     builder: Mac_android platform_interaction_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android platform_view__start_up
     builder: Mac_android platform_view__start_up
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android run_release_test
     builder: Mac_android run_release_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android service_extensions_test
     builder: Mac_android service_extensions_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android smoke_catalina_start_up
     builder: Mac_android smoke_catalina_start_up
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android textfield_perf__timeline_summary
     builder: Mac_android textfield_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_android tiles_scroll_perf__timeline_summary
     builder: Mac_android tiles_scroll_perf__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac tool_tests_commands
     builder: Mac tool_tests_commands
     presubmit: false
+    properties:
+      tags: >
+        ["framework","hostonly","shard"]
     scheduler: luci
-    tags:
-      - key: shard
-        value: "true"
-      - key: hostonly
-        value: "true"
-      - key: framework
-        value: "true"
 
   - name: Mac_ios backdrop_filter_perf_ios__timeline_summary
     builder: Mac_ios backdrop_filter_perf_ios__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios basic_material_app_ios__compile
     builder: Mac_ios basic_material_app_ios__compile
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios channels_integration_test_ios
     builder: Mac_ios channels_integration_test_ios
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios complex_layout_ios__compile
     builder: Mac_ios complex_layout_ios__compile
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios complex_layout_ios__start_up
     builder: Mac_ios complex_layout_ios__start_up
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios complex_layout_scroll_perf_ios__timeline_summary
     builder: Mac_ios complex_layout_scroll_perf_ios__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios external_ui_integration_test_ios
     builder: Mac_ios external_ui_integration_test_ios
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios flavors_test_ios
     builder: Mac_ios flavors_test_ios
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios flutter_gallery__transition_perf_e2e_ios
     builder: Mac_ios flutter_gallery__transition_perf_e2e_ios
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios flutter_gallery__transition_perf_e2e_ios32
     builder: Mac_ios flutter_gallery__transition_perf_e2e_ios32
     bringup: true
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios flutter_gallery_ios__compile
     builder: Mac_ios flutter_gallery_ios__compile
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios flutter_gallery_ios__start_up
     builder: Mac_ios flutter_gallery_ios__start_up
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios flutter_gallery_ios__transition_perf
     builder: Mac_ios flutter_gallery_ios__transition_perf
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios flutter_view_ios__start_up
     builder: Mac_ios flutter_view_ios__start_up
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios hello_world_ios__compile
     builder: Mac_ios hello_world_ios__compile
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios hot_mode_dev_cycle_macos_target__benchmark
     builder: Mac_ios hot_mode_dev_cycle_macos_target__benchmark
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios integration_ui_ios_driver
     builder: Mac_ios integration_ui_ios_driver
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios integration_ui_ios_keyboard_resize
     builder: Mac_ios integration_ui_ios_keyboard_resize
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios integration_ui_ios_screenshot
     builder: Mac_ios integration_ui_ios_screenshot
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios integration_ui_ios_textfield
     builder: Mac_ios integration_ui_ios_textfield
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios integration_test_test_ios
     builder: Mac_ios integration_test_test_ios
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios ios_app_with_extensions_test
     builder: Mac_ios ios_app_with_extensions_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios ios_content_validation_test
     builder: Mac_ios ios_content_validation_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios ios_defines_test
     builder: Mac_ios ios_defines_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios ios_platform_view_tests
     builder: Mac_ios ios_platform_view_tests
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios large_image_changer_perf_ios
     builder: Mac_ios large_image_changer_perf_ios
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios macos_chrome_dev_mode
     builder: Mac_ios macos_chrome_dev_mode
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios microbenchmarks_ios
     builder: Mac_ios microbenchmarks_ios
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios native_ui_tests_ios32
     builder: Mac_ios native_ui_tests_ios32
     bringup: true
     presubmit: false
-    tags:
-      - key: devicelab
-        value: "true"
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
 
   - name: Mac_ios new_gallery_ios__transition_perf
     builder: Mac_ios new_gallery_ios__transition_perf
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios platform_channel_sample_test_ios
     builder: Mac_ios platform_channel_sample_test_ios
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios platform_channel_sample_test_swift
     builder: Mac_ios platform_channel_sample_test_swift
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios platform_channels_benchmarks_ios
     builder: Mac_ios platform_channels_benchmarks_ios
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios platform_interaction_test_ios
     builder: Mac_ios platform_interaction_test_ios
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios platform_view_ios__start_up
     builder: Mac_ios platform_view_ios__start_up
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios platform_views_scroll_perf_ios__timeline_summary
     builder: Mac_ios platform_views_scroll_perf_ios__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios post_backdrop_filter_perf_ios__timeline_summary
     builder: Mac_ios post_backdrop_filter_perf_ios__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios simple_animation_perf_ios
     builder: Mac_ios simple_animation_perf_ios
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios smoke_catalina_hot_mode_dev_cycle_ios__benchmark
     builder: Mac_ios smoke_catalina_hot_mode_dev_cycle_ios__benchmark
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Mac_ios tiles_scroll_perf_ios__timeline_summary
     builder: Mac_ios tiles_scroll_perf_ios__timeline_summary
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Windows gradle_plugin_fat_apk_test
     builder: Windows gradle_plugin_fat_apk_test
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab","hostonly"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
-      - key: hostonly
-        value: "true"
 
   - name: Windows_android complex_layout_win__compile
     builder: Windows_android complex_layout_win__compile
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Windows_android basic_material_app_win__compile
     builder: Windows_android basic_material_app_win__compile
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Windows_android flutter_gallery_win__compile
     builder: Windows_android flutter_gallery_win__compile
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Windows_android windows_chrome_dev_mode
     builder: Windows_android windows_chrome_dev_mode
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Windows_android flavors_test_win
     builder: Windows_android flavors_test_win
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Windows_android channels_integration_test_win
     builder: Windows_android channels_integration_test_win
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"
 
   - name: Windows_android hot_mode_dev_cycle_win__benchmark
     builder: Windows_android hot_mode_dev_cycle_win__benchmark
     presubmit: false
+    properties:
+      tags: >
+        ["devicelab"]
     scheduler: luci
-    tags:
-      - key: devicelab
-        value: "true"