Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merging from default

changeset:   2662:ade8d606462d
parent:      2660:0ec5d68c3b12
user:        Justin Wood <Callek@gmail.com>
date:        Fri Oct 05 13:30:31 2012 -0400
summary:     Bug 797679 - Force reboot.py for mobile jobs to never retry on failure. r=armenzg

changeset:   2663:ae9b7711c605
tag:         tip
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Fri Oct 05 14:47:45 2012 -0400
summary:     Bug 790741. Backout all changes since uploading on try is failing. r=bustage

--HG--
branch : production-0.8
  • Loading branch information...
commit 902316df1407c80748ae023acab883aba0d1e2f7 2 parents 0cbde16 + b1208ca
Rail Aliiev authored October 05, 2012
3  misc.py
@@ -968,7 +968,6 @@ def generateBranchObjects(config, name, secrets=None):
968 968
 
969 969
         uploadPackages = pf.get('uploadPackages', True)
970 970
         uploadSymbols = False
971  
-        disableSymbols = pf.get('disable_symbols', False)
972 971
         packageTests = False
973 972
         talosMasters = pf.get('talos_masters', [])
974 973
         unittestBranch = "%s-%s-opt-unittest" % (name, platform)
@@ -1090,7 +1089,6 @@ def generateBranchObjects(config, name, secrets=None):
1090 1089
                 'codesighs': codesighs,
1091 1090
                 'uploadPackages': uploadPackages,
1092 1091
                 'uploadSymbols': uploadSymbols,
1093  
-                'disableSymbols': disableSymbols,
1094 1092
                 'buildSpace': buildSpace,
1095 1093
                 'clobberURL': config['base_clobber_url'],
1096 1094
                 'clobberTime': clobberTime,
@@ -1344,7 +1342,6 @@ def generateBranchObjects(config, name, secrets=None):
1344 1342
                 doBuildAnalysis=doBuildAnalysis,
1345 1343
                 uploadPackages=uploadPackages,
1346 1344
                 uploadSymbols=pf.get('upload_symbols', False),
1347  
-                disableSymbols=pf.get('disable_symbols', False),
1348 1345
                 nightly=True,
1349 1346
                 createSnippet=create_snippet,
1350 1347
                 createPartial=pf.get('create_partial', config['create_partial']),
12  process/factory.py
@@ -202,7 +202,7 @@ def parse_make_upload(rc, stdout, stderr):
202 202
     the upload make target and returns a dictionary of important
203 203
     file urls.'''
204 204
     retval = {}
205  
-    for m in re.findall("^(https?://.*?\.(?:tar\.bz2|dmg|zip|apk|rpm|mar|tar\.gz))$",
  205
+    for m in re.findall("^(https?://.*?\.(?:tar\.bz2|dmg|zip|apk|rpm|mar))$",
206 206
                         "\n".join([stdout, stderr]), re.M):
207 207
         if 'devel' in m and m.endswith('.rpm'):
208 208
             retval['develRpmUrl'] = m
@@ -716,7 +716,6 @@ def __init__(self, objdir, platform, configRepoPath, configSubDir,
716 716
                  triggeredSchedulers=None, triggerBuilds=False,
717 717
                  mozconfigBranch="production", useSharedCheckouts=False,
718 718
                  stagePlatform=None, testPrettyNames=False, l10nCheckTest=False,
719  
-                 disableSymbols=False,
720 719
                  doBuildAnalysis=False,
721 720
                  downloadSubdir=None,
722 721
                  multiLocale=False,
@@ -784,7 +783,6 @@ def __init__(self, objdir, platform, configRepoPath, configSubDir,
784 783
         self.baseName = baseName
785 784
         self.uploadPackages = uploadPackages
786 785
         self.uploadSymbols = uploadSymbols
787  
-        self.disableSymbols = disableSymbols
788 786
         self.createSnippet = createSnippet
789 787
         self.createPartial = createPartial
790 788
         self.doCleanup = doCleanup
@@ -939,7 +937,7 @@ def __init__(self, objdir, platform, configRepoPath, configSubDir,
939 937
         self.multiLocale = multiLocale
940 938
 
941 939
         self.addBuildSteps()
942  
-        if self.uploadSymbols or (not self.disableSymbols and (self.packageTests or self.leakTest)):
  940
+        if self.uploadSymbols or self.packageTests or self.leakTest:
943 941
             self.addBuildSymbolsStep()
944 942
         if self.uploadSymbols:
945 943
             self.addUploadSymbolsStep()
@@ -5257,6 +5255,7 @@ def addTearDownSteps(self):
5257 5255
             command=['python', '-u', '/builds/sut_tools/reboot.py',
5258 5256
                       WithProperties("%(sut_ip)s"),
5259 5257
                      ],
  5258
+            log_eval_func=lambda c,s: SUCCESS,
5260 5259
         ))
5261 5260
 
5262 5261
 class TalosFactory(RequestSortingBuildFactory):
@@ -5932,8 +5931,9 @@ def do_disconnect(cmd):
5932 5931
                          command=['python', '-u', '/builds/sut_tools/reboot.py',
5933 5932
                                   WithProperties("%(sut_ip)s"),
5934 5933
                                  ],
5935  
-                         env=self.env)
5936  
-            )
  5934
+                         env=self.env,
  5935
+                         log_eval_func=lambda c,s: SUCCESS,
  5936
+            ))
5937 5937
         else:
5938 5938
             #the following step is to help the linux running on mac minis reboot cleanly
5939 5939
             #see bug561442

0 notes on commit 902316d

Please sign in to comment.
Something went wrong with that request. Please try again.