Fix jumbo bot names

Platforms are 64 bit by default, don't need to have it as a suffix. TBR=dpranke Bug: 782863 Change-Id: Ia97dab4a9f0a141b918faa8e523e56f95504c0d0 Reviewed-on: https://chromium-review.googlesource.com/1014647 Reviewed-by: Stephen Martinis <martiniss@chromium.org> Reviewed-by: Vadim Shtayura <vadimsh@chromium.org> Reviewed-by: Ryan Tseng <hinoka@chromium.org> Reviewed-by: Dirk Pranke <dpranke@chromium.org> Commit-Queue: Stephen Martinis <martiniss@chromium.org> Cr-Commit-Position: refs/heads/master@{#551560}
cbchan · Apr 18, 2018 · 9be3445 · 9be3445
1 parent cd9265c
commit 9be3445
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
@@ -609,7 +609,7 @@ buckets {
     }
 
     builders {
-      name: "linux64-jumbo-rel"
+      name: "linux-jumbo-rel"
       mixins: "linux-ci"
     }
 
@@ -863,7 +863,7 @@ buckets {
 
     # Win bots.
     builders {
-      name: "win64-jumbo-rel"
+      name: "win-jumbo-rel"
       mixins: "win-ci"
     }
 

diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
@@ -733,7 +733,7 @@ consoles: {
     short_name: "64"
   }
   builders: {
-    name: "buildbucket/luci.chromium.ci/win64-jumbo-rel"
+    name: "buildbucket/luci.chromium.ci/win-jumbo-rel"
     category: "release|builder|jumbo"
     short_name: "jumbo"
   }
@@ -881,7 +881,7 @@ consoles: {
     short_name: "gcc"
   }
   builders: {
-    name: "buildbucket/luci.chromium.ci/linux64-jumbo-rel"
+    name: "buildbucket/luci.chromium.ci/linux-jumbo-rel"
     category: "jumbo"
     short_name: "jumbo"
   }

diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
@@ -93,7 +93,7 @@ trigger {
   triggers: "linux-blink-heap-verification"
   triggers: "Linux ASan LSan Builder"
   triggers: "Linux Builder"
-  triggers: "linux64-jumbo-rel"
+  triggers: "linux-jumbo-rel"
   triggers: "Linux Builder (dbg)"
   triggers: "Linux Builder (dbg)(32)"
   triggers: "Linux FYI GPU TSAN Release"
@@ -118,7 +118,7 @@ trigger {
   triggers: "GPU FYI Win x64 Builder"
   triggers: "GPU FYI Win x64 Builder (dbg)"
   triggers: "GPU FYI Win x64 dEQP Builder"
-  triggers: "win64-jumbo-rel"
+  triggers: "win-jumbo-rel"
   triggers: "Win Builder"
   triggers: "Win Builder (dbg)"
   triggers: "Win x64 Builder"
@@ -683,12 +683,12 @@ job {
 }
 
 job {
-  id: "linux64-jumbo-rel"
+  id: "linux-jumbo-rel"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "linux64-jumbo-rel"
+    builder: "linux-jumbo-rel"
   }
 }
 
@@ -1398,12 +1398,12 @@ job {
 }
 
 job {
-  id: "win64-jumbo-rel"
+  id: "win-jumbo-rel"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "win64-jumbo-rel"
+    builder: "win-jumbo-rel"
   }
 }
 

diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
@@ -2701,7 +2701,7 @@
       "empty_main"
     ]
   },
-  "linux64-jumbo-rel": {
+  "linux-jumbo-rel": {
     "additional_compile_targets": [
       "all"
     ]

diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
@@ -3039,7 +3039,7 @@
       }
     ]
   },
-  "win64-jumbo-rel": {
+  "win-jumbo-rel": {
     "additional_compile_targets": [
       "all"
     ]

diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
@@ -1414,7 +1414,7 @@
           'scripts': 'check_network_annotations_script',
         }
       },
-      'linux64-jumbo-rel': {
+      'linux-jumbo-rel': {
         'additional_compile_targets': [
           'all'
         ]
@@ -2040,7 +2040,7 @@
           'scripts': 'check_network_annotations_script',
         },
       },
-      'win64-jumbo-rel': {
+      'win-jumbo-rel': {
         'additional_compile_targets': [
           'all'
         ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -3039,7 +3039,7 @@ @@
           }
         ]
       },
-      "win64-jumbo-rel": {
+      "win-jumbo-rel": {
         "additional_compile_targets": [
           "all"
         ]
@@ Expand Down @@