bug 1188813 - Add clean-up when make node_modules fails before retry. a=test-only
authorAus Lacroix <aus@mozilla.com>
Tue, 04 Aug 2015 13:31:30 -0700
changeset 287777 b8167e33f68f0e8623a1f0449a2dcabec9d9374e
parent 287776 ba2c1933b39bbe07089e9c021fa76c47de8caed8
child 287778 635f9c7b29d06137d5ae41052f18c55999623723
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstest-only
bugs1188813
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 1188813 - Add clean-up when make node_modules fails before retry. a=test-only
testing/mozharness/mozharness.json
testing/mozharness/mozharness/mozilla/gaia.py
--- a/testing/mozharness/mozharness.json
+++ b/testing/mozharness/mozharness.json
@@ -1,4 +1,4 @@
 {
     "repo": "https://hg.mozilla.org/build/mozharness",
-    "revision": "d72df953784c"
+    "revision": "9e3b69e89620"
 }
--- a/testing/mozharness/mozharness/mozilla/gaia.py
+++ b/testing/mozharness/mozharness/mozilla/gaia.py
@@ -376,17 +376,17 @@ class GaiaMixin(object):
                'node_modules',
                'NODE_MODULES_SRC=npm-cache',
                'VIRTUALENV_EXISTS=1']
         kwargs = {
             'output_timeout': 300,
             'error_list': self.npm_error_list
         }
         code = self.retry(self.run_command, attempts=3, good_statuses=(0,),
-                          args=[cmd, dirs['abs_gaia_dir']], kwargs=kwargs)
+                          args=[cmd, dirs['abs_gaia_dir']], cleanup=cleanup_node_modules, kwargs=kwargs)
         if code:
             # Dump npm-debug.log, if it exists
             npm_debug = os.path.join(dirs['abs_gaia_dir'], 'npm-debug.log')
             if os.access(npm_debug, os.F_OK):
                 self.info('dumping npm-debug.log')
                 self.run_command(['cat', npm_debug])
             else:
                 self.info('npm-debug.log doesn\'t exist, not dumping')