Merge experimental config to the master config for WebRTC Chromium FYI.

I have a green waterfall which confirms the experimental src-side
config works now, so make BuildBot use the new config. This will make
it easier to switch from BuildBot to LUCI.

This CL needs to land concurrently with the infra CLs + restart of the
WebRTC Chromium FYI master since the bots change names as a part of
this process.

Bug: 877018
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I2811718874bb9f6079488fc0ee17e6f324ae50b0
Reviewed-on: https://chromium-review.googlesource.com/1249103
Commit-Queue: Patrik Höglund <phoglund@chromium.org>
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595033}

infra/config/global/cr-buildbucket.cfg

@@ -3252,9 +3252,7 @@ buckets {
       recipe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
-        # TODO(phoglund): change to chromium.webrtc.fyi once done rewriting the
-        # configs to be src-side
-        properties: "mastername:chromium.webrtc.fyi.experimental"
+        properties: "mastername:chromium.webrtc.fyi"
         name: "chromium"
       }
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"

infra/config/global/luci-milo.cfg

@@ -3869,109 +3869,109 @@ consoles {
   refs: "refs/heads/master"
   manifest_name: "REVISION"
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Android Builder (dbg)"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder (dbg)"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder (dbg)"
     category: "android|debug|builder"
     short_name: "32"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Android Builder ARM64 (dbg)"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder ARM64 (dbg)"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder ARM64 (dbg)"
     category: "android|debug|builder"
     short_name: "64"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Android Tests (dbg) (K Nexus5)"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Android Tests (dbg) (K Nexus5)"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Tests (dbg) (K Nexus5)"
     category: "android|debug|tester"
     short_name: "K"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Android Tests (dbg) (M Nexus5X)"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Android Tests (dbg) (M Nexus5X)"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Tests (dbg) (M Nexus5X)"
     category: "android|debug|tester"
     short_name: "M"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Android Builder"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Android Builder"
     category: "android|release"
     short_name: "32"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Linux Builder (dbg)"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Linux Builder (dbg)"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Linux Builder (dbg)"
     category: "linux|debug"
     short_name: "bld"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Linux Builder"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Linux Builder"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Linux Builder"
     category: "linux|release"
     short_name: "bld"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Linux Tester"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Linux Tester"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Linux Tester"
     category: "linux|release"
     short_name: "tst"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Mac Builder (dbg)"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Mac Builder (dbg)"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Mac Builder (dbg)"
     category: "mac|debug"
     short_name: "bld"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Mac Builder"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Mac Builder"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Mac Builder"
     category: "mac|release"
     short_name: "bld"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Mac Tester"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Mac Tester"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Mac Tester"
     category: "mac|release"
     short_name: "tst"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Win Builder (dbg)"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Win Builder (dbg)"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Win Builder (dbg)"
     category: "win|debug"
     short_name: "bld"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Win Builder"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Win Builder"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Win Builder"
     category: "win|release|builder"
     short_name: "32"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Win10 Tester"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Win10 Tester"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Win10 Tester"
     category: "win|release|tester"
     short_name: "10"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Win7 Tester"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Win7 Tester"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Win7 Tester"
     category: "win|release|tester"
     short_name: "7"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/Win8 Tester"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI Win8 Tester"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI Win8 Tester"
     category: "win|release|tester"
     short_name: "8"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/ios-device"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI ios-device"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI ios-device"
     category: "ios"
     short_name: "dev"
   }
   builders {
-    name: "buildbot/chromium.webrtc.fyi/ios-simulator"
+    name: "buildbot/chromium.webrtc.fyi/WebRTC Chromium FYI ios-simulator"
     name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI ios-simulator"
     category: "ios"
     short_name: "sim"

ios/build/bots/chromium.webrtc.fyi.experimental/WebRTC Chromium FYI ios-device.json

-{
-  "comments": [
-    "Builder for 32-bit devices.",
-    "Build is performed with gn+ninja.",
-    "TODO(crbug.com/877018): graduate to chromium.webrtc.fyi when it works."
-  ],
-  "xcode build version": "10a254a",
-  "gn_args": [
-    "additional_target_cpus=[ \"arm64\" ]",
-    "goma_dir=\"$(goma_dir)\"",
-    "ios_enable_code_signing=false",
-    "is_component_build=false",
-    "is_debug=false",
-    "target_cpu=\"arm\"",
-    "target_os=\"ios\"",
-    "use_goma=true"
-  ],
-  "additional_compile_targets": [
-    "all"
-  ],
-  "tests": [
-  ]
-}

ios/build/bots/chromium.webrtc.fyi.experimental/WebRTC Chromium FYI ios-simulator.json

-{
-  "comments": [
-    "Runs tests on @3x, @2x, 64-bit, 32-bit, phone, tablet, iOS 10, and iOS 9.",
-    "TODO(crbug.com/877018): graduate to chromium.webrtc.fyi when it works."
-  ],
-  "xcode build version": "10a254a",
-  "gn_args": [
-    "additional_target_cpus=[\"x86\"]",
-    "goma_dir=\"$(goma_dir)\"",
-    "ios_enable_code_signing=false",
-    "is_component_build=false",
-    "is_debug=true",
-    "symbol_level=1",
-    "target_cpu=\"x64\"",
-    "target_os=\"ios\"",
-    "use_goma=true"
-  ],
-  "additional_compile_targets": [
-    "all"
-  ],
-  "configuration": "Debug",
-  "sdk": "iphonesimulator10.0",
-  "tests": [
-    {
-      "include": "common_tests.json",
-      "device type": "iPhone 6s Plus",
-      "os": "10.0"
-    },
-    {
-      "include": "common_tests.json",
-      "device type": "iPhone 6s",
-      "os": "10.0"
-    },
-    {
-      "include": "common_tests.json",
-      "device type": "iPhone 5",
-      "os": "10.0"
-    },
-    {
-      "include": "common_tests.json",
-      "device type": "iPad Air 2",
-      "os": "10.0"
-    },
-    {
-      "include": "common_tests.json",
-      "device type": "iPad Retina",
-      "os": "10.0"
-    },
-    {
-      "include": "common_tests.json",
-      "device type": "iPhone 5",
-      "comments": [
-        "This still relies on system iOS 9.0 legacy simulators,",
-        "since Xcode 8.0 doesn't provide it. But our test runner",
-        "doesn't support Xcode 7.0 anymore..."
-      ],
-      "os": "9.0"
-    },
-    {
-      "include": "common_tests.json",
-      "device type": "iPad Air 2",
-      "os": "9.0"
-    }
-  ]
-}

testing/buildbot/waterfalls.pyl

@@ -3427,112 +3427,6 @@
   },
   {
     'name': 'chromium.webrtc.fyi',
-    'machines': {
-      'Android Builder': {
-        'additional_compile_targets': [
-          'browser_tests',
-          'capture_unittests',
-          'content_browsertests',
-          'content_unittests',
-          'jingle_unittests',
-          'remoting_unittests',
-        ],
-      },
-      'Android Builder (dbg)': {
-        'additional_compile_targets': [
-          'browser_tests',
-          'capture_unittests',
-          'content_browsertests',
-          'content_unittests',
-          'jingle_unittests',
-          'remoting_unittests',
-        ],
-      },
-      'Android Builder ARM64 (dbg)': {
-        'additional_compile_targets': [
-          'browser_tests',
-          'capture_unittests',
-          'content_browsertests',
-          'content_unittests',
-          'jingle_unittests',
-          'remoting_unittests',
-        ],
-      },
-      'Linux Builder': {
-        'additional_compile_targets': [
-          'browser_tests',
-          'capture_unittests',
-          'content_browsertests',
-          'content_unittests',
-          'frame_analyzer',
-          'jingle_unittests',
-          'remoting_unittests',
-          'remoting/webapp:webapp',
-        ],
-      },
-      'Linux Builder (dbg)': {
-        'additional_compile_targets': [
-          'browser_tests',
-          'capture_unittests',
-          'content_browsertests',
-          'content_unittests',
-          'frame_analyzer',
-          'jingle_unittests',
-          'remoting_unittests',
-          'remoting/webapp:webapp',
-        ],
-      },
-      'Mac Builder': {
-        'additional_compile_targets': [
-          'browser_tests',
-          'capture_unittests',
-          'content_browsertests',
-          'content_unittests',
-          'frame_analyzer',
-          'jingle_unittests',
-          'remoting_unittests',
-        ],
-      },
-      'Mac Builder (dbg)': {
-        'additional_compile_targets': [
-          'browser_tests',
-          'capture_unittests',
-          'content_browsertests',
-          'content_unittests',
-          'frame_analyzer',
-          'jingle_unittests',
-          'remoting_unittests',
-          'remoting/webapp:webapp',
-        ],
-      },
-      'Win Builder': {
-        'additional_compile_targets': [
-          'browser_tests',
-          'capture_unittests',
-          'content_browsertests',
-          'content_unittests',
-          'frame_analyzer',
-          'jingle_unittests',
-          'remoting_unittests',
-          'remoting/webapp:webapp',
-        ],
-      },
-      'Win Builder (dbg)': {
-        'additional_compile_targets': [
-          'browser_tests',
-          'capture_unittests',
-          'content_browsertests',
-          'content_unittests',
-          'frame_analyzer',
-          'jingle_unittests',
-          'remoting_unittests',
-          'remoting/webapp:webapp',
-        ],
-      },
-    },
-  },
-  {
-    'name': 'chromium.webrtc.fyi.experimental',
     'machines': {
       # For builders, specify targets if the builder has no associated
       # tester (if it does, it will build what the tester needs).

tools/mb/mb_config.pyl

@@ -468,19 +468,6 @@
     },
 
     'chromium.webrtc.fyi': {
-      'Android Builder': 'android_release_bot_minimal_symbols',
-      'Android Builder (dbg)': 'android_debug_static_bot',
-      'Android Builder ARM64 (dbg)': 'android_debug_static_bot_arm64',
-      'Linux Builder': 'gpu_tests_release_bot',
-      'Linux Builder (dbg)': 'debug_bot',
-      'Mac Builder': 'gpu_tests_release_bot',
-      'Mac Builder (dbg)': 'debug_bot',
-      'Win Builder': 'release_bot_x86_minimal_symbols_no_com_init_hooks_with_codecs',
-      'Win Builder (dbg)': 'debug_bot_x86_minimal_symbols_no_com_init_hooks_with_codecs',
-    },
-
-    # TODO(crbug.com/877018): Remove once experimental configs are verified.
-    'chromium.webrtc.fyi.experimental': {
       'WebRTC Chromium FYI Android Builder': 'android_release_bot_minimal_symbols',
       'WebRTC Chromium FYI Android Builder (dbg)': 'android_debug_static_bot',
       'WebRTC Chromium FYI Android Builder ARM64 (dbg)': 'android_debug_static_bot_arm64',