Make recipes use the new way of enabling goma.

Make recipes use the new way of enabling goma.

BUG=338501, 332697

[Paweł Hajdan Jr., 2014-02-04 19:49:22]

The non-expectation changes are just two files:

scripts/slave/recipe_modules/chromium/api.py
scripts/slave/recipe_modules/chromium/config.py

[Nico, 2014-02-04 19:57:00]

Also add 332697 to BUG=.

You might have to change compile.py to not do its PATH rewriting when use_goma
is active, not sure if goma will be confused by having itself in the PATH in
this new mode.

lgtm, thanks for working on this!

https://codereview.chromium.org/134193014/diff/1/scripts/slave/recipe_modules...
File scripts/slave/recipe_modules/chromium/config.py (right):

https://codereview.chromium.org/134193014/diff/1/scripts/slave/recipe_modules...
scripts/slave/recipe_modules/chromium/config.py:198: goma_dir = Path('[BUILD]',
'goma')
To make sure: [BUILD] evaluates to the root of the buildbot dir, not the root of
chromium's build dire, yes?

[Paweł Hajdan Jr., 2014-02-04 20:40:14]

https://codereview.chromium.org/134193014/diff/1/scripts/slave/recipe_modules...
File scripts/slave/recipe_modules/chromium/config.py (right):

https://codereview.chromium.org/134193014/diff/1/scripts/slave/recipe_modules...
scripts/slave/recipe_modules/chromium/config.py:198: goma_dir = Path('[BUILD]',
'goma')
On 2014/02/04 19:57:02, Nico wrote:
> To make sure: [BUILD] evaluates to the root of the buildbot dir, not the root
of
> chromium's build dire, yes?

Yes. I tested this locally.

[Paweł Hajdan Jr., 2014-02-04 20:40:42]

The CQ bit was checked by phajdan.jr@chromium.org

[commit-bot: I haz the power, 2014-02-04 20:40:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 20:44:23]

Presubmit check for 134193014-1 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit ERRORS **
tests/masters_test.py (56.29s) failed
1 masters failed:
master.client.dynamorio
52 masters succeeded, 1 failed, 0 skipped in 56.2s.

=== Error running master.client.dynamorio === 
2014-02-04 12:43:37-0800 [-] adding IStatusReceiver <WebStatus on port tcp:8259
at 0x3eca248>
2014-02-04 12:43:37-0800 [-] buildbot.status.web.baseweb.RotateLogSite starting
on 8259
2014-02-04 12:43:37-0800 [-] Starting factory
<buildbot.status.web.baseweb.RotateLogSite instance at 0x2ac384033bd8>
2014-02-04 12:43:37-0800 [-] Setting up http.log rotating 10 files of 1000000
bytes each
2014-02-04 12:43:37-0800 [-] WebStatus using
(/b/commit-queue/workdir/tools/build/masters/master.client.dynamorio/public_html)
2014-02-04 12:43:37-0800 [-] adding IStatusReceiver
<buildbot.status.mail.MailNotifier instance at 0x3e75f38>
2014-02-04 12:43:37-0800 [-] removing 0 old schedulers, updating 0, and adding 3
2014-02-04 12:43:39-0800 [-] periodic_stable: missed scheduled build time, so
building immediately
2014-02-04 12:43:39-0800 [-] added buildset 1 to database
2014-02-04 12:43:42-0800 [-] Unhandled Error
	Traceback (most recent call last):
	Failure: twisted.internet.defer.FirstError: FirstError[#1, [Failure instance:
Traceback: <class 'sqlalchemy.exc.OperationalError'>: (OperationalError)
database is locked u'INSERT INTO schedulers (name, state, class_name) VALUES (?,
?, ?)' ('all', '{}', 'buildbot.schedulers.basic.Scheduler')
	/usr/lib/python2.7/threading.py:524:__bootstrap
	/usr/lib/python2.7/threading.py:551:__bootstrap_inner
	/usr/lib/python2.7/threading.py:504:run
	--- <exception caught here> ---
	/b/commit-queue/workdir/tools/build/third_party/twisted_10_2/twisted/python/threadpool.py:207:_worker
	/b/commit-queue/workdir/tools/build/third_party/twisted_10_2/twisted/python/context.py:59:callWithContext
	/b/commit-queue/workdir/tools/build/third_party/twisted_10_2/twisted/python/context.py:37:callWithContext
	/b/commit-queue/workdir/tools/build/third_party/buildbot_8_4p1/buildbot/db/pool.py:112:thd
	/b/commit-queue/workdir/tools/build/third_party/buildbot_8_4p1/buildbot/db/schedulers.py:165:thd
	/b/commit-queue/workdir/tools/build/third_party/sqlalchemy_0_7_1/sqlalchemy/engine/base.py:1358:execute
	/b/commit-queue/workdir/tools/build/third_party/sqlalchemy_0_7_1/sqlalchemy/engine/base.py:1491:_execute_clauseelement
	/b/commit-queue/workdir/tools/build/third_party/sqlalchemy_0_7_1/sqlalchemy/engine/base.py:1599:_execute_context
	/b/commit-queue/workdir/tools/build/third_party/sqlalchemy_0_7_1/sqlalchemy/engine/base.py:1592:_execute_context
	/b/commit-queue/workdir/tools/build/third_party/sqlalchemy_0_7_1/sqlalchemy/engine/default.py:325:do_execute
	]]



Presubmit checks took 82.1s to calculate.

Was the presubmit check useful? If not, run "git cl presubmit -v"
to figure out which PRESUBMIT.py was run, then run git blame
on the file to figure out who to ask for help.

[commit-bot: I haz the power, 2014-02-04 20:45:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 20:49:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 20:50:27]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[commit-bot: I haz the power, 2014-02-04 20:50:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 20:51:20]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[commit-bot: I haz the power, 2014-02-04 20:51:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 20:52:09]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[commit-bot: I haz the power, 2014-02-04 20:52:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 20:52:56]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[commit-bot: I haz the power, 2014-02-04 20:53:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 20:53:48]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[commit-bot: I haz the power, 2014-02-04 20:53:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 20:54:37]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[commit-bot: I haz the power, 2014-02-04 20:54:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 20:55:32]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[commit-bot: I haz the power, 2014-02-04 20:55:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 20:56:25]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[commit-bot: I haz the power, 2014-02-04 20:56:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 20:57:41]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[commit-bot: I haz the power, 2014-02-04 20:57:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 20:58:37]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[commit-bot: I haz the power, 2014-02-04 21:15:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 21:16:41]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[commit-bot: I haz the power, 2014-02-04 21:19:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 21:20:26]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[commit-bot: I haz the power, 2014-02-04 21:20:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1

[commit-bot: I haz the power, 2014-02-04 21:21:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-04 21:21:44]

Failed to apply patch for build/scripts/slave/recipe_modules/chromium/api.py:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/chromium/api.py
  Hunk #1 FAILED at 67.
  1 out of 1 hunk FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/chromium/api.py.rej

Patch:       build/scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
===================================================================
--- build/scripts/slave/recipe_modules/chromium/api.py	(revision 248765)
+++ build/scripts/slave/recipe_modules/chromium/api.py	(working copy)
@@ -67,6 +67,8 @@
       args += ['--compiler', self.c.compile_py.compiler]
     if self.c.compile_py.mode:
       args += ['--mode', self.c.compile_py.mode]
+    if self.c.compile_py.goma_dir:
+      args += ['--goma-dir', self.c.compile_py.goma_dir]
     if (self.m.properties.get('clobber') is not None or
         self.c.compile_py.clobber or
         force_clobber):

[Nico, 2014-02-04 21:21:47]

unsubscribe

(Pawel, can you close this? Looks like it landed 30 min ago here:
https://src.chromium.org/viewvc/chrome?revision=248778&view=revision)


On Tue, Feb 4, 2014 at 1:20 PM, <commit-bot@chromium.org> wrote:

> CQ is trying da patch. Follow status at
> https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/134193014/1
>
>
> https://codereview.chromium.org/134193014/
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.