clang upload script: Move list of bots from docs to Cq-Include-Trybots:.

This way, the cq makes sure that we run all the bots we want to run
(as long as we use the upload script), which is less error-prone.

This doesn't work for internal chrome/try bots yet, so these stay on
the old system for now.

Bug: 1047347
Change-Id: Iedecf56d4cfa5f6e923b716b927147ac3c28dedc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2016844
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Hans Wennborg <hans@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736982}

docs/updating_clang.md

@@ -45,18 +45,12 @@ An archive of all packages built so far is at https://is.gd/chromeclang
 1.  Run the goma package update script to push these packages to goma. If you do
     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:
+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 chromium/try -b mac_chromium_asan_rel_ng \
-      -b linux_chromium_cfi_rel_ng \
-      -b linux_chromium_chromeos_asan_rel_ng -b linux_chromium_msan_rel_ng \
-      -b linux_chromium_chromeos_msan_rel_ng -b linux-chromeos-dbg \
-      -b win-asan -b chromeos-amd64-generic-cfi-thin-lto-rel \
-      -b linux_chromium_compile_dbg_32_ng -b win7-rel \
-      -b win-angle-deqp-rel-32 -b win-angle-deqp-rel-64 \
-      -b dawn-win10-x86-deps-rel &&
+    git cl try && \
     git cl try -B chrome/try -b iphone-device -b ipad-device \
       -b linux-chromeos-chrome
     ```

tools/clang/scripts/upload_revision.py

@@ -26,6 +26,24 @@ 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, '..', '..', '..'))
 
+COMMIT_FOOTER = \
+'''
+
+Cq-Include-Trybots: chromium/try:mac_chromium_asan_rel_ng
+Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
+Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_asan_rel_ng
+Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
+Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
+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
+'''
+# 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')
 
 def PatchRevision(clang_git_revision, clang_svn_revision, clang_sub_revision):
@@ -95,7 +113,7 @@ def main():
                                      clang_old_git_revision[:8],
                                      clang_old_sub_revision)
 
-  commit_message = 'Ran `{}`.'.format(' '.join(sys.argv))
+  commit_message = 'Ran `{}`.'.format(' '.join(sys.argv)) + COMMIT_FOOTER
   Git(["commit", "-m", "Roll clang {} : {}.\n\n{}".format(
       old_rev_string, rev_string, commit_message)])