[2 of 3] Move ccompute_config static IP bots to GCE Provider builderl…

…ess bots. Dependent on internal repo changes. Bug: 864819 Change-Id: Ic45d9b9690b27874e84e5150d1fadecd21ddc24b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1960478 Commit-Queue: Eric Foo <efoo@chromium.org> Reviewed-by: Aaron Gable <agable@chromium.org> Reviewed-by: John Budorick <jbudorick@chromium.org> Cr-Commit-Position: refs/heads/master@{#724885}
marcosholgado · Dec 14, 2019 · cab9df3 · cab9df3
1 parent 1afd079
commit cab9df3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/infra/config/buckets/ci.star b/infra/config/buckets/ci.star
@@ -1350,6 +1350,7 @@ fyi_windows_builder(
 
 fyi_windows_builder(
     name = 'win-annotator-rel',
+    builderless = True,
     execution_timeout = 16 * time.hour,
 )
 
@@ -2076,6 +2077,7 @@ memory_builder(
     cores = 32,
     goma_backend = None,
     goma_enable_ats = False,
+    builderless = True,
     os = os.WINDOWS_DEFAULT,
 )
 
@@ -2201,6 +2203,7 @@ win_builder(
 win_builder(
     name = 'Win x64 Builder (dbg)',
     cores = 32,
+    builderless = True,
     os = os.WINDOWS_ANY,
 )
 

diff --git a/infra/config/buckets/findit.star b/infra/config/buckets/findit.star
@@ -22,7 +22,8 @@ luci.recipe.defaults.cipd_package.set(
 defaults.auto_builder_dimension.set(False)
 defaults.bucket.set('findit')
 defaults.build_numbers.set(True)
-defaults.builderless.set(False)
+defaults.builderless.set(True)
+defaults.ssd.set(True)
 defaults.configure_kitchen.set(True)
 defaults.execution_timeout.set(8 * time.hour)
 defaults.pool.set('luci.chromium.findit')

diff --git a/infra/config/buckets/try.star b/infra/config/buckets/try.star
@@ -1223,7 +1223,7 @@ linux_builder(
 
 linux_builder(
     name = 'linux_upload_clang',
-    builderless = False,
+    builderless = True,
     cores = 32,
     executable = luci.recipe(name = 'chromium_upload_clang'),
     goma_backend = None,

diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
@@ -5090,10 +5090,11 @@ buckets: <
       name: "Win x64 Builder (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builder:Win x64 Builder (dbg)"
+      dimensions: "builderless:1"
       dimensions: "cores:32"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows"
+      dimensions: "ssd:0"
       recipe: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -7596,10 +7597,11 @@ buckets: <
       name: "win-annotator-rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builder:win-annotator-rel"
+      dimensions: "builderless:1"
       dimensions: "cores:8"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows-10"
+      dimensions: "ssd:0"
       recipe: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -7656,10 +7658,11 @@ buckets: <
       name: "win-asan"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builder:win-asan"
+      dimensions: "builderless:1"
       dimensions: "cores:32"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows-10"
+      dimensions: "ssd:0"
       recipe: <
         name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -9156,7 +9159,9 @@ buckets: <
       name: "findit-rerun"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "pool:luci.chromium.findit"
+      dimensions: "ssd:1"
       recipe: <
         name: "findit/chromium/single_revision"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -9175,7 +9180,9 @@ buckets: <
       name: "findit_variable"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "pool:luci.chromium.findit"
+      dimensions: "ssd:1"
       recipe: <
         name: "findit/chromium/compile"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -9194,8 +9201,10 @@ buckets: <
       name: "linux_chromium_bot_db_exporter"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
       dimensions: "os:Ubuntu-16.04"
       dimensions: "pool:luci.chromium.findit"
+      dimensions: "ssd:1"
       recipe: <
         name: "findit/chromium/export_bot_db"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@@ -16690,10 +16699,11 @@ buckets: <
       name: "linux_upload_clang"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "builder:linux_upload_clang"
+      dimensions: "builderless:1"
       dimensions: "cores:32"
       dimensions: "cpu:x86-64"
       dimensions: "os:Ubuntu-14.04"
+      dimensions: "ssd:0"
       recipe: <
         name: "chromium_upload_clang"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"