Rename CQ bots in documentation

These bots were renamed already in the CQ, but docs weren't updated. This CL updates everything I could find in chromium/src. TBR=mef, kbr, odejesush, miu, tkent Bug: 888810 Change-Id: I4c1d5ecb829c192a6f0f91160e2b4f8162f114a6 Reviewed-on: https://chromium-review.googlesource.com/c/1464135 Reviewed-by: Misha Efimov <[email protected]> Reviewed-by: Kent Tamura <[email protected]> Reviewed-by: John Budorick <[email protected]> Commit-Queue: Stephen Martinis <[email protected]> Cr-Commit-Position: refs/heads/master@{#631055}
AryanGitHub · Feb 12, 2019 · 089f5f0 · 089f5f0
1 parent 899ce3d
commit 089f5f0
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 66 deletions.
diff --git a/components/cronet/native/test_instructions.md b/components/cronet/native/test_instructions.md
@@ -41,5 +41,5 @@ special configurations like ASAN and TSAN.
 You can use the -b flag to test against just one of those, like this:
 
 ```shell
-$ git cl try -b linux_chromium_rel_ng
+$ git cl try -b linux-rel
 ```
diff --git a/content/test/gpu/gpu_tests/screenshot_sync_integration_test.py b/content/test/gpu/gpu_tests/screenshot_sync_integration_test.py
@@ -128,7 +128,7 @@ def _CheckScreenshot(self):
     # It seems that we should be able to set start_x to 2 * inset (one to
     # account for the inner div having left=1 and one to avoid sampling the
     # aa edge). For reasons not fully understood this is insufficent on
-    # several bots (N9, 6P, mac_chromium_rel_ng).
+    # several bots (N9, 6P, mac-rel).
     start_x = 10
     start_y = inset
     outer_size = 256 - inset

diff --git a/device/bluetooth/bluetooth_adapter_mac.h b/device/bluetooth/bluetooth_adapter_mac.h
@@ -106,8 +106,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterMac
   void DeviceConnected(IOBluetoothDevice* device);
 
   // We only use CoreBluetooth when OS X >= 10.10. This because the
-  // CBCentralManager destructor was found to crash on the mac_chromium_rel_ng
-  // builder running 10.9.5. May also cause blued to crash on OS X 10.9.5
+  // CBCentralManager destructor was found to crash on the mac-rel builder
+  // running 10.9.5. May also cause blued to crash on OS X 10.9.5
   // (crbug.com/506287).
   static bool IsLowEnergyAvailable();
 

diff --git a/docs/closure_compilation.md b/docs/closure_compilation.md
@@ -170,7 +170,7 @@ Closure compilation runs in the compile step of Linux, Android and ChromeOS buil
 From the command line, you try your change with:
 
 ```shell
-git cl try -b linux_chromium_rel_ng
+git cl try -b linux-rel
 ```
 
 ## Integrating with the continuous build

diff --git a/docs/gpu/gpu_testing.md b/docs/gpu/gpu_testing.md
@@ -110,13 +110,13 @@ Sends your job to the default set of try servers.
 The GPU tests are part of the default set for Chromium CLs, and are run as part
 of the following tryservers' jobs:
 
-*   [linux_chromium_rel_ng], formerly on the `tryserver.chromium.linux` waterfall
-*   [mac_chromium_rel_ng], formerly on the `tryserver.chromium.mac` waterfall
-*   [win_chromium_rel_ng], formerly on the `tryserver.chromium.win` waterfall
+*   [linux-rel], formerly on the `tryserver.chromium.linux` waterfall
+*   [mac-rel], formerly on the `tryserver.chromium.mac` waterfall
+*   [win7-rel], formerly on the `tryserver.chromium.win` waterfall
 
-[linux_chromium_rel_ng]:    https://ci.chromium.org/p/chromium/builders/luci.chromium.try/linux_chromium_rel_ng?limit=100
-[mac_chromium_rel_ng]:      https://ci.chromium.org/p/chromium/builders/luci.chromium.try/mac_chromium_rel_ng?limit=100
-[win7_chromium_rel_ng]:     https://ci.chromium.org/p/chromium/builders/luci.chromium.try/win7_chromium_rel_ng?limit=100
+[linux-rel]:    https://ci.chromium.org/p/chromium/builders/luci.chromium.try/linux-rel?limit=100
+[mac-rel]:      https://ci.chromium.org/p/chromium/builders/luci.chromium.try/mac-rel?limit=100
+[win7-rel]:     https://ci.chromium.org/p/chromium/builders/luci.chromium.try/win7-rel?limit=100
 
 Scan down through the steps looking for the text "GPU"; that identifies those
 tests run on the GPU bots. For each test the "trigger" step can be ignored; the
@@ -127,9 +127,9 @@ tests. If you want to, you must invoke "git cl try" separately for each
 tryserver master you want to reference, for example:
 
 ```sh
-git cl try -b linux_chromium_rel_ng
-git cl try -b mac_chromium_rel_ng
-git cl try -b win7_chromium_rel_ng
+git cl try -b linux-rel
+git cl try -b mac-rel
+git cl try -b win7-rel
 ```
 
 Alternatively, the Gerrit UI can be used to send a patch set to these try
@@ -476,9 +476,9 @@ to all of the bots, because the GPU bots are a limited resource and do not
 currently have the capacity to absorb large new test suites. It is safer to get
 new tests running on the chromium.gpu.fyi waterfall first, and expand from there
 to the chromium.gpu waterfall (which will also make them run against every
-Chromium CL by virtue of the `linux_chromium_rel_ng`, `mac_chromium_rel_ng`,
-`win7_chromium_rel_ng` and `android-marshmallow-arm64-rel` tryservers' mirroring
-of the bots on this waterfall – so be careful!).
+Chromium CL by virtue of the `linux-rel`, `mac-rel`, `win7-rel` and
+`android-marshmallow-arm64-rel` tryservers' mirroring of the bots on this
+waterfall – so be careful!).
 
 Tryjobs which add new test steps to the chromium.gpu.json file will run those
 new steps during the tryjob, which helps ensure that the new test won't break

diff --git a/docs/gpu/gpu_testing_bot_details.md b/docs/gpu/gpu_testing_bot_details.md
@@ -167,10 +167,9 @@ In the [tools/build] workspace:
             and then break on the waterfall.
         *   This file defines the behavior of the following GPU-related try
             bots:
-            *   `linux_chromium_rel_ng`, `mac_chromium_rel_ng`, and
-                `win_chromium_rel_ng`, which run against every Chromium CL, and
-                which mirror the behavior of bots on the chromium.gpu
-                waterfall.
+            *   `linux-rel`, `mac-rel`, and `win7-rel`, which run against every
+                Chromium CL, and which mirror the behavior of bots on the
+                chromium.gpu waterfall.
             *   The ANGLE try bots, which run against ANGLE CLs, and mirror the
                 behavior of the chromium.gpu.fyi waterfall (including using
                 top-of-tree ANGLE, and running additional tests not run by the

diff --git a/docs/gpu/pixel_wrangling.md b/docs/gpu/pixel_wrangling.md
@@ -179,19 +179,15 @@ shift, and a calendar appointment.
         waterfall, but instead run as part of the regular tryjobs on the
         Chromium waterfalls. The GPU tests run as part of the following
         tryservers' jobs:
-        1.  <code>[linux_chromium_rel_ng]</code> on the [luci.chromium.try]
-            waterfall
-        1.  <code>[mac_chromium_rel_ng]</code> on the [luci.chromium.try]
-            waterfall
-        1.  <code>[win7_chromium_rel_ng]</code> on the [luci.chromium.try]
-            waterfall
+        1.  `[linux-rel]` on the [luci.chromium.try] waterfall
+        1.  `[mac-rel]` on the [luci.chromium.try] waterfall
+        1.  `[win7-rel]` on the [luci.chromium.try] waterfall
     1.  The best tool to use to quickly find flakiness on the tryservers is the
         new [Chromium Try Flakes] tool. Look for the names of GPU tests (like
-        maps_pixel_test) as well as the test machines (e.g.
-        mac_chromium_rel_ng). If you see a flaky test, file a bug like [this
-        one](http://crbug.com/444430). Also look for compile flakes that may
-        indicate that a bot needs to be clobbered. Contact the Chromium
-        sheriffs or troopers if so.
+        maps_pixel_test) as well as the test machines (e.g. mac-rel). If you
+        see a flaky test, file a bug like [this one](http://crbug.com/444430).
+        Also look for compile flakes that may indicate that a bot needs to be
+        clobbered. Contact the Chromium sheriffs or troopers if so.
     1.  Glance at these trybots from time to time and see if any GPU tests are
         failing frequently. **Note** that test failures are **expected** on
         these bots: individuals' patches may fail to apply, fail to compile, or
@@ -257,11 +253,12 @@ shift, and a calendar appointment.
 [Sheriff-O-Matic now has support for the chromium.gpu.fyi waterfall]: https://sheriff-o-matic.appspot.com/chromium.gpu.fyi
 [Chromium tab]: https://sheriff-o-matic.appspot.com/chromium
 [tree sheriffing page]: https://sites.google.com/a/chromium.org/dev/developers/tree-sheriffs
-[linux_chromium_rel_ng]: https://ci.chromium.org/p/chromium/builders/luci.chromium.try/linux_chromium_rel_ng
+[linux-rel]: https://ci.chromium.org/p/chromium/builders/luci.chromium.try/linux-rel
 [luci.chromium.try]: https://ci.chromium.org/p/chromium/g/luci.chromium.try/builders
-[mac_chromium_rel_ng]: https://ci.chromium.org/p/chromium/builders/luci.chromium.try/mac_chromium_rel_ng
+[mac-rel]: https://ci.chromium.org/p/chromium/builders/luci.chromium.try/mac-rel
 [tryserver.chromium.mac]: https://ci.chromium.org/p/chromium/g/tryserver.chromium.mac/builders
-[win7_chromium_rel_ng]: https://ci.chromium.org/p/chromium/builders/luci.chromium.try/win7_chromium_rel_ng
+[win7-rel]:
+https://ci.chromium.org/p/chromium/builders/luci.chromium.try/win7-rel
 [tryserver.chromium.win]: https://ci.chromium.org/p/chromium/g/tryserver.chromium.win/builders
 [Chromium Try Flakes]: http://chromium-try-flakes.appspot.com/
 <!-- TODO(kainino): link doesn't work, but is still included from chromium-swarm homepage so not removing it now -->

diff --git a/docs/infra/trybot_usage.md b/docs/infra/trybot_usage.md
@@ -43,7 +43,7 @@ $ git cl try
 Launching a particular trybot:
 
 ```bash
-$ git cl try -B luci.chromium.try -b linux_chromium_rel_ng
+$ git cl try -B luci.chromium.try -b linux-rel
 ```
 
 Launching multiple trybots:

diff --git a/docs/parsing_test_results.md b/docs/parsing_test_results.md
@@ -19,16 +19,16 @@ of the configuration. Some examples:
   Android, using the *debug* configuration.
 * *android-kitkat-arm-rel* builds and runs tests for Chromium for Android,
   using the *release* configuration on a kitkat device.
-* *win7_chromium_rel_ng* builds and runs tests for Chromium on Windows, using
+* *win7-rel* builds and runs tests for Chromium on Windows, using
   the release configuration on a Windows 7 device. *ng* stands for next
   generation, but this has no meaning as the previous generation was already
   phased out.
 
 Green boxes refer to builds that passed. Red boxes refer to builds that failed.
 Some failed builds get automatically retried by the CQ. In this example,
-*linux_chromium_rel_ng* and *mac_chromium_rel_ng* were automatically retried
-[hence the two **X**s], but *win7_chromium_rel_ng* was not. The **X** on the
-left is the first build, and the **X** on the right is the second build.
+*linux-rel* and *mac-rel* were automatically retried [hence the two **X**s], but
+*win7-rel* was not. The **X** on the left is the first build, and the **X** on the right
+is the second build.
 
 Each of these boxes is a link that provides more information about the build
 failure.

diff --git a/media/cast/sender/h264_vt_encoder_unittest.cc b/media/cast/sender/h264_vt_encoder_unittest.cc
@@ -269,7 +269,7 @@ class H264VideoToolboxEncoderTest : public ::testing::Test {
 scoped_refptr<media::VideoFrame> H264VideoToolboxEncoderTest::frame_;
 FrameSenderConfig H264VideoToolboxEncoderTest::video_sender_config_;
 
-// Failed on mac_chromium_rel_ng trybot. http://crbug.com/627260
+// Failed on mac-rel trybot. http://crbug.com/627260
 TEST_F(H264VideoToolboxEncoderTest, DISABLED_CheckFrameMetadataSequence) {
   scoped_refptr<MetadataRecorder> metadata_recorder(new MetadataRecorder());
   VideoEncoder::FrameEncodedCallback cb = base::Bind(
@@ -299,7 +299,7 @@ TEST_F(H264VideoToolboxEncoderTest, DISABLED_CheckFrameMetadataSequence) {
 }
 
 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
-// Failed on mac_chromium_rel_ng trybot. http://crbug.com/627260
+// Failed on mac-rel trybot. http://crbug.com/627260
 TEST_F(H264VideoToolboxEncoderTest, DISABLED_CheckFramesAreDecodable) {
   VideoDecoderConfig config(
       kCodecH264, H264PROFILE_MAIN, frame_->format(), VideoColorSpace(),

diff --git a/third_party/blink/renderer/platform/heap/heap_thread_test.cc b/third_party/blink/renderer/platform/heap/heap_thread_test.cc
@@ -129,7 +129,7 @@ class MemberSameThreadCheckTester : public AlternatingThreadTester {
 };
 
 #if DCHECK_IS_ON()
-// TODO(keishi) This test is flaky on mac_chromium_rel_ng bot.
+// TODO(keishi) This test is flaky on mac-rel bot.
 // crbug.com/709069
 #if !defined(OS_MACOSX)
 TEST(HeapDeathTest, MemberSameThreadCheck) {
@@ -152,7 +152,7 @@ class PersistentSameThreadCheckTester : public AlternatingThreadTester {
 };
 
 #if DCHECK_IS_ON()
-// TODO(keishi) This test is flaky on mac_chromium_rel_ng bot.
+// TODO(keishi) This test is flaky on mac-rel bot.
 // crbug.com/709069
 #if !defined(OS_MACOSX)
 TEST(HeapDeathTest, PersistentSameThreadCheck) {
@@ -192,7 +192,7 @@ class MarkingSameThreadCheckTester : public AlternatingThreadTester {
 };
 
 #if DCHECK_IS_ON()
-// TODO(keishi) This test is flaky on mac_chromium_rel_ng bot.
+// TODO(keishi) This test is flaky on mac-rel bot.
 // crbug.com/709069
 #if !defined(OS_MACOSX)
 TEST(HeapDeathTest, MarkingSameThreadCheck) {

diff --git a/third_party/blink/tools/blinkpy/web_tests/try_flag.py b/third_party/blink/tools/blinkpy/web_tests/try_flag.py
@@ -22,14 +22,14 @@
 
 # TODO(skobes): use blinkpy/config/builders.json instead of hardcoding these.
 BUILDER_CONFIGS = {
-    'linux_chromium_rel_ng': TestConfiguration('Linux', '', 'release'),
-    'mac_chromium_rel_ng': TestConfiguration('Mac', '', 'release'),
-    'win7_chromium_rel_ng': TestConfiguration('Win', '', 'release')
+    'linux-rel': TestConfiguration('Linux', '', 'release'),
+    'mac-rel': TestConfiguration('Mac', '', 'release'),
+    'win7-rel': TestConfiguration('Win', '', 'release')
 }
 BUILDER_BUCKETS = {
-    'linux_chromium_rel_ng': 'luci.chromium.try',
-    'mac_chromium_rel_ng': 'master.tryserver.chromium.mac',
-    'win7_chromium_rel_ng': 'master.tryserver.chromium.win'
+    'linux-rel': 'luci.chromium.try',
+    'mac-rel': 'luci.chromium.try',
+    'win7-rel': 'luci.chromium.try',
 }
 FLAG_FILE = 'additional-driver-flag.setting'
 

diff --git a/third_party/blink/tools/blinkpy/web_tests/try_flag_unittest.py b/third_party/blink/tools/blinkpy/web_tests/try_flag_unittest.py
@@ -16,9 +16,9 @@
 class TryFlagTest(unittest.TestCase):
 
     def __init__(self, *args, **kwargs):
-        self.linux_build = Build('linux_chromium_rel_ng', 100)
-        self.mac_build = Build('mac_chromium_rel_ng', 101)
-        self.win_build = Build('win7_chromium_rel_ng', 102)
+        self.linux_build = Build('linux-rel', 100)
+        self.mac_build = Build('mac-rel', 101)
+        self.win_build = Build('win7-rel', 102)
         self.mock_try_results = {
             self.linux_build: TryJobStatus('COMPLETED', 'SUCCESS'),
             self.win_build: TryJobStatus('COMPLETED', 'SUCCESS'),
@@ -57,11 +57,11 @@ def _run_trigger_test(self, regenerate):
             ['git', 'cl', 'upload', '--bypass-hooks', '-f',
              '-m', 'Flag try job for --foo.'],
             ['git', 'cl', 'try', '-B', 'luci.chromium.try',
-             '-b', 'linux_chromium_rel_ng'],
-            ['git', 'cl', 'try', '-B', 'master.tryserver.chromium.mac',
-             '-b', 'mac_chromium_rel_ng'],
-            ['git', 'cl', 'try', '-B', 'master.tryserver.chromium.win',
-             '-b', 'win7_chromium_rel_ng']
+             '-b', 'linux-rel'],
+            ['git', 'cl', 'try', '-B', 'luci.chromium.try',
+             '-b', 'mac-rel'],
+            ['git', 'cl', 'try', '-B', 'luci.chromium.try',
+             '-b', 'win7-rel']
         ])
 
     def test_trigger(self):

diff --git a/third_party/blink/web_tests/fast/peerconnection/RTCPeerConnection-many.html b/third_party/blink/web_tests/fast/peerconnection/RTCPeerConnection-many.html
@@ -39,11 +39,10 @@
     assert_throws("UnknownError", allocatePeerConnection,
                   'Creating too many RTCPeerConnections gives UnknownError');
   } finally {
-    // On swarming bots running webkit_layout_tests (such as
-    // win7_chromium_rel_ng), garbage collection is not guaranteed to occur
-    // between test pages. As such we cannot assume that the initial count is 0,
-    // and we must clean up after this test regardless of test result or
-    // unrelated tests may fail.
+    // On swarming bots running webkit_layout_tests (such as win7-rel), garbage
+    // collection is not guaranteed to occur between test pages. As such we
+    // cannot assume that the initial count is 0, and we must clean up after
+    // this test regardless of test result or unrelated tests may fail.
     let totalAllocatedPeerConnections = internals.peerConnectionCount();
     let peerConnectionsAllocatedByTest = peerConnections.length;
     cleanUpPeerConnectionsAndGarbageCollect();

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
@@ -393,8 +393,8 @@
       'fuchsia-arm64-cast': 'release_bot_fuchsia_arm64_cast',
       'fuchsia-x64-cast': 'release_bot_fuchsia_cast',
       'linux-gcc-rel': 'release_bot_x86_minimal_symbols_no_clang_cxx11',
-      # linux-jumbo-rel is identical to linux_chromium_rel_ng for perf
-      # comparisons, except for the jumbo part.
+      # linux-jumbo-rel is identical to linux-rel for perf comparisons, except
+      # for the jumbo part.
       'linux-jumbo-rel': 'gpu_tests_release_bot_jumbo_no_symbols_use_dummy_lastchange',
       'linux-ozone-rel': 'ozone_linux_release_bot',
       'linux-xenial-rel': 'release_bot',