commit 3e3f5d9874cd7cd2c9bb853233e98dd1014b4d3f
author Achuith Bhandarkar <achuith@chromium.org> Mon Sep 09 05:32:51 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Oct 03 21:50:05 2019 +0000
tree ff3b62e83627318b7bac88e8b6a2cf9095201050
parent 16ed278ad4cbf427c054a8ebae7c7e097638ee5f

commands: Set default jobs for autoninja.

autoninja seems to use too many processes on bots. Limit -j to 80,
similar to chromium infra.

This reverts part of CL:1382941

BUG=chromium:998076
TEST=unittest

Change-Id: Idadc47c60ede21672a210c956bc1f4301394dfa2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1792569
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Andrew Lamb <andrewlamb@chromium.org>
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
Auto-Submit: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1837051
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Andrey Pronin <apronin@chromium.org>
Tested-by: Andrey Pronin <apronin@chromium.org>

cbuildbot/commands.py

diff --git a/cbuildbot/commands.py b/cbuildbot/commands.py
index 58c0f1e..19c5cc9 100644
--- a/cbuildbot/commands.py
+++ b/cbuildbot/commands.py
@@ -3730,6 +3730,8 @@
 class ChromeSDK(object):
   """Wrapper for the 'cros chrome-sdk' command."""
 
+  DEFAULT_GOMA_JOBS = '80'
+
   def __init__(self,
                cwd,
                board,
@@ -3813,10 +3815,11 @@
     Returns:
       Command line to run "ninja".
     """
-    return [
-        'autoninja', '-C',
-        self._GetOutDirectory(debug=debug), 'chromiumos_preflight'
-    ]
+    cmd = ['autoninja']
+    if self.goma:
+      cmd += ['-j', self.DEFAULT_GOMA_JOBS]
+    cmd += ['-C', self._GetOutDirectory(debug=debug), 'chromiumos_preflight']
+    return cmd
 
   def VMTest(self, image_path, debug=False):
     """Run cros_run_test in a VM.

cbuildbot/commands_unittest.py

diff --git a/cbuildbot/commands_unittest.py b/cbuildbot/commands_unittest.py
index a3fc888..babd610 100644
--- a/cbuildbot/commands_unittest.py
+++ b/cbuildbot/commands_unittest.py
@@ -152,10 +152,9 @@
     self.assertCommandContains(['debug', self.BOARD] + list(self.EXTRA_ARGS) +
                                list(self.EXTRA_ARGS2) + self.CMD, cwd=self.CWD)
 
-  def MockGetDefaultTarget(self, with_nacl=False):
-    nacl_str = ' ninja nacl gold' if with_nacl else ''
+  def MockGetDefaultTarget(self):
     self.rc.AddCmdResult(partial_mock.In('qlist-%s' % self.BOARD),
-                         output='%s%s' % (constants.CHROME_CP, nacl_str))
+                         output='%s' % constants.CHROME_CP)
 
   def testNinjaWithRunArgs(self):
     """Test that running ninja with run_args.
@@ -172,8 +171,10 @@
   def testNinjaOptions(self):
     """Test that running ninja with non-default options."""
     self.MockGetDefaultTarget()
-    self.inst.Ninja(debug=True)
-    self.assertCommandContains(['autoninja', '-C', 'out_%s/Debug' % self.BOARD,
+    custom_inst = commands.ChromeSDK(self.CWD, self.BOARD, goma=True)
+    custom_inst.Ninja(debug=True)
+    self.assertCommandContains(['autoninja', '-j', '80', '-C',
+                                'out_%s/Debug' % self.BOARD,
                                 'chromiumos_preflight'])