clang upload script: Use Cq-Include-Trybots: for internal bots too.

This used to not work, but now it does. Follow-up to
https://chromium-review.googlesource.com/c/2016844

Bug: 1047347
Change-Id: I6a8290ef69c5f1d5840c289fc73677dbe3d5236d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2031679
Auto-Submit: Nico Weber <thakis@chromium.org>
Commit-Queue: Reid Kleckner <rnk@chromium.org>
Reviewed-by: Reid Kleckner <rnk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737409}

docs/updating_clang.md

@@ -46,14 +46,9 @@ An archive of all packages built so far is at https://is.gd/chromeclang
     not have the necessary credentials to do the upload, ask clang@chromium.org
     to find someone who does
 1.  Run an exhaustive set of try jobs to test the new compiler. The CL
-    description created by upload_revision.py includes `CQ_INCLUDE_TRYBOTS`
-    lines for all needed bots, so it's sufficient to just run:
-
-    ```shell
-    git cl try && \
-    git cl try -B chrome/try -b iphone-device -b ipad-device \
-      -b linux-chromeos-chrome
-    ```
+    description created by upload_revision.py includes `Cq-Include-Trybots:`
+    lines for all needed bots, so it's sufficient to just run `git cl try`
+    (or hit "CQ DRY RUN" on gerrit).
 
 1.  Commit roll CL from the first step
 1.  The bots will now pull the prebuilt binary, and goma will have a matching

tools/clang/scripts/upload_revision.py

@@ -26,6 +26,7 @@ THIS_DIR = os.path.dirname(__file__)
 UPDATE_PY_PATH = os.path.join(THIS_DIR, "update.py")
 CHROMIUM_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', '..', '..'))
 
+# Keep lines in here at <= 72 columns, else they wrap in gerrit.
 COMMIT_FOOTER = \
 '''
 
@@ -38,11 +39,11 @@ Cq-Include-Trybots: chromium/try:linux-chromeos-dbg,win-asan
 Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
 Cq-Include-Trybots: chromium/try:linux_chromium_compile_dbg_32_ng
 Cq-Include-Trybots: chromium/try:win7-rel,win-angle-deqp-rel-32
-Cq-Include-Trybots: chromium/try:win-angle-deqp-rel-64,dawn-win10-x86-deps-rel
+Cq-Include-Trybots: chromium/try:win-angle-deqp-rel-64
+Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
+Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
+Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
 '''
-# TODO(https://crbug.com/1047347): Add:
-# Cq-Include-Trybots: chrome/try:iphone-device,ipad-device,linux-chromeos-chrome
-# and remove that from updating_clang.md
 
 is_win = sys.platform.startswith('win32')